Merge branch 'MDL-53972-master' of git://github.com/mihailges/moodle
commit810f12c25b77fa7cb4610f485682c161064853f9
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 12:04:42 +0000 (17 14:04 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:48 +0000 (19 08:46 +0800)
treebadd70dfd574eb02ad4106b5fb343c0d5f38a947
parent1f9964a6e034d444613ce20b820106aee0f77d7b
parent98f9db0d6390a128e37ad08b95322563b3be2fb8
Merge branch 'MDL-53972-master' of git://github.com/mihailges/moodle