Merge branch 'MDL-52953-master' of git://github.com/abgreeve/moodle
commitc6f64c217dada673488880a44aee56839fba0944
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 12:17:56 +0000 (16 14:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 12:17:56 +0000 (16 14:17 +0200)
tree151cf3245a8b1e29f0cbf5827daac70432d21228
parentaa59fb2ea2fc99356421a8f3c77003039f9de40c
parent28d0d12f5fe38e419c1bd10152dfdc446242ca46
Merge branch 'MDL-52953-master' of git://github.com/abgreeve/moodle