Merge branch 'MDL-61689-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:16:27 +0000 (01:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:16:27 +0000 (01:16 +0200)
commit5db00dc3c98fad28d300aa2bb9a8d376fed406d1
tree21665aa5b49320c5142218c127e437d8541f7c97
parent0f25080367360c303e0e3f148f8f23d98ce713a3
parent33dca9457336c7e853423db52c259894eb4b2110
Merge branch 'MDL-61689-master' of git://github.com/andrewnicols/moodle