Merge branch 'MDL-69422-310-2' of git://github.com/junpataleta/moodle into MOODLE_310...
authorJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 08:03:17 +0000 (16:03 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 08:03:17 +0000 (16:03 +0800)

Trivial merge