Merge branch 'MDL-70324-master' of https://github.com/JBThong/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 14 Dec 2020 03:29:37 +0000 (11:29 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 14 Dec 2020 03:29:37 +0000 (11:29 +0800)

Trivial merge