Merge branch 'MDL-62889_master' of git://github.com/markn86/moodle
commit9e52f4adc2666e667a46e16a0200f6440b1af410
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 04:11:34 +0000 (17 12:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 04:11:34 +0000 (17 12:11 +0800)
treec851bd0ce6d4739db0c21dbe2fee78fa3df0331a
parentaffd85ce24077eff34e4a90f61554a29a96478d6
parentb77e5841f842a3dd0e42c3c7b6dba926229c0159
Merge branch 'MDL-62889_master' of git://github.com/markn86/moodle