Merge branch 'MDL-68572-master' of https://github.com/catalyst/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 7 May 2020 08:10:20 +0000 (16:10 +0800)
committerSara Arjona <sara@moodle.com>
Thu, 7 May 2020 16:30:47 +0000 (18:30 +0200)

Trivial merge