Merge branch 'MDL-62761-master' of https://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 13:29:34 +0000 (15:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 13:29:34 +0000 (15:29 +0200)
commit49a973014cf2e5b0ef6010a8b4de64290efa60fa
treef57ff90891fce3d26548c5abeca21cd253d66954
parentbf19506dfb2c4dbd249247eadc8fc14a5b6d3eec
parenta4ffdbf3f0ba8fdecf0115f81c2ce1971ceee1c1
Merge branch 'MDL-62761-master' of https://github.com/jmvedrine/moodle