Merge branch 'MDL-69065-master' of git://github.com/peterRd/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 24 Jun 2020 01:30:31 +0000 (09:30 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 24 Jun 2020 02:11:08 +0000 (10:11 +0800)
commitc7d5af7d6ededd45d90fcd7fea64422378456217
treee0745dcd61ba3b6bb5558cc18640ae1aecee91f7
parenta68004a433b7e7b9d77ae349eb76484d239a076b
parentc8388ead0fe0c372e2ba63be5fe51d3402b85c79
Merge branch 'MDL-69065-master' of git://github.com/peterRd/moodle