Merge branch 'MDL-68898-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 3 Jun 2020 04:10:38 +0000 (12:10 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 3 Jun 2020 04:10:38 +0000 (12:10 +0800)

Trivial merge