Merge branch 'MDL-68970' of https://github.com/timhunt/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 07:51:11 +0000 (08:51 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 07:51:11 +0000 (08:51 +0100)

Trivial merge