Merge branch 'MDL-62403-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 7 May 2020 06:17:32 +0000 (14:17 +0800)
committerSara Arjona <sara@moodle.com>
Thu, 7 May 2020 16:30:47 +0000 (18:30 +0200)

Trivial merge