Merge branch 'MDL-62663' of https://github.com/andrewhancox/moodle
commita02f330b5d97dffb020b0eee781b370ec405793f
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 07:58:09 +0000 (17 09:58 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:43 +0000 (19 08:46 +0800)
treebcb8b6605562059e0ab71cdf6c0d339112bbc1a4
parente3852300469e8ecb96f54cc526ac252c66ab79ec
parent7068dd3990b810975360c7779a628404e6f09a62
Merge branch 'MDL-62663' of https://github.com/andrewhancox/moodle