Merge branch 'MDL-68163-master' of https://github.com/syxton/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 3 Jun 2020 04:06:06 +0000 (12:06 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 3 Jun 2020 04:06:06 +0000 (12:06 +0800)

Trivial merge