Merge branch 'MDL-66560-36' of https://github.com/lucaboesch/moodle into MOODLE_36_STABLE
commit2efbb5dcc0783e5728c484843f52c5a71c6e3a02
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Sep 2019 13:58:38 +0000 (5 15:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Sep 2019 13:58:38 +0000 (5 15:58 +0200)
tree94eb99e2df4fe3805e93df3b7b8337cbb5d72022
parent8a7f86f3872ad11d2cc83875564aa90897c92f0a
parentc04c03594e1a4cc89c62e84d59f33f8f691709d0
Merge branch 'MDL-66560-36' of https://github.com/lucaboesch/moodle into MOODLE_36_STABLE