Merge branch 'MDL-68746-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 28 May 2020 03:56:23 +0000 (11:56 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 28 May 2020 03:56:23 +0000 (11:56 +0800)

Trivial merge