Merge branch 'MDL-68998-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 00:33:38 +0000 (08:33 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 00:33:38 +0000 (08:33 +0800)

Trivial merge