Merge branch 'MDL-70151-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 9 Dec 2020 06:45:39 +0000 (14:45 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 9 Dec 2020 06:45:39 +0000 (14:45 +0800)

Trivial merge