Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:56:20 +0000 (09:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:56:20 +0000 (09:56 +0800)
commit8cae0850712d44fb79fa897ca31a0bf954838165
treede8b27948930d75376f10c3fa4a34b697bbf6b1c
parent4786443998663b5276f0f2165910e45674376adf
parent1c06098b6b1fdcd552ab7349206e6a0a0f5a930c
Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle