Merge branch 'MDL-33509-master' of git://github.com/mihailges/moodle
commit8dfafebc13ad2c73a046a6e602d742d0eea7fa4c
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 05:52:31 +0000 (9 13:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 05:52:31 +0000 (9 13:52 +0800)
treef0e6021a41a76ccf1fe9ad477881efc78a0f991a
parenta31b3cf30b1e4aad5d995c0df0aa4f51a0c773b1
parentdaa31a0491989be1ee81b8958adcf0e7d544b261
Merge branch 'MDL-33509-master' of git://github.com/mihailges/moodle