Merge branch 'MDL-60985-master' of git://github.com/lucaboesch/moodle
commitc39da484f2eb3a32c137801f2363485d49dc0326
authorJake Dallimore <jake@moodle.com>
Tue, 24 Dec 2019 06:44:04 +0000 (24 14:44 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 24 Dec 2019 06:44:04 +0000 (24 14:44 +0800)
tree0cf2007649f0f423dea12b2afb122524abb4ddf1
parentf00542c4853882126a2ebb9bc9e105c6f4addb5b
parent3bd2e330ab8f5f62871521be3c40d1be2171aef9
Merge branch 'MDL-60985-master' of git://github.com/lucaboesch/moodle