Merge branch 'MDL-69716-master' of git://github.com/aanabit/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 04:39:48 +0000 (12:39 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 29 Oct 2020 04:39:48 +0000 (12:39 +0800)

Trivial merge