Merge branch 'MDL-62868-master' of https://github.com/snake/moodle
commit523704d9ec406d2a0cbc51e7eafba131f7018f5d
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 08:20:17 +0000 (17 10:20 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:44 +0000 (19 08:46 +0800)
treee3b9b3854bc5a9947686972f395df960e4b7df5e
parenta02f330b5d97dffb020b0eee781b370ec405793f
parentfd6d98cc90ee70fe643c1a6e24d410a0fb9939b8
Merge branch 'MDL-62868-master' of https://github.com/snake/moodle