Merge branch 'MDL-70322-master' of git://github.com/roland04/moodle
authorSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:04:03 +0000 (12:04 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 16 Dec 2020 11:04:03 +0000 (12:04 +0100)

Trivial merge