Merge branch 'MDL-60918-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 19:17:20 +0000 (20:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 19:17:20 +0000 (20:17 +0100)
commit4a87646654c938f8a8cd10203b99c323c6ebe379
tree383999f7a07cbf5302ac3545c917df924559b3c0
parent447cf624097fbb4107f29f02649fe30e0d5e6999
parente36a2f2aa7bc9f3f47daa45931493bedafdeebee
Merge branch 'MDL-60918-master' of git://github.com/ryanwyllie/moodle