Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 05:52:49 +0000 (18:52 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 05:52:49 +0000 (18:52 +1300)
commit24131d08c076fe6b5eabc40fba351ca3b4d33dd2
treed09f9691e95039dacbd09ff28a899d9295707b8c
parent6d326b17d818b20c77a2f36813fda27268ca17b9
parent9a7671da80624d0ad1aca12a36002a2f66050232
Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle