Merge branch 'MDL-51177-master' of git://github.com/andrewnicols/moodle
commitac61871ebe979c8376f2e9826387f2225b7aa31b
authorJun Pataleta <jun@moodle.com>
Thu, 13 Sep 2018 08:17:02 +0000 (13 16:17 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 13 Sep 2018 08:17:02 +0000 (13 16:17 +0800)
treeb25f4487e43dd1224e7780d86c43bd75811ebc69
parent0e05bac861fc551260b759fcf88fccf0bb6f0a19
parent11cd7c89d44113d929074c054fca3136910e40ea
Merge branch 'MDL-51177-master' of git://github.com/andrewnicols/moodle