Merge branch 'MDL-69726' of git://github.com/aolley/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 19 Oct 2020 23:45:35 +0000 (07:45 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 19 Oct 2020 23:45:35 +0000 (07:45 +0800)

Trivial merge