Merge branch 'MDL-60966-master' of https://github.com/snake/moodle
commitbb3e956ed9a740e9185566f429644e7301f58fe4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Dec 2017 23:36:00 +0000 (27 00:36 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:58 +0000 (27 17:54 +0100)
tree72fe9d85882bfbacfdf0df59d73dacee3a96f6fa
parent72614d74d8a61fad3a55dec91157a9d032fca613
parent0377e78e36c1b2aef83d4f248ecaa034c5627d7a
Merge branch 'MDL-60966-master' of https://github.com/snake/moodle