Merge branch 'MDL-70308-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Tue, 12 Jan 2021 16:04:25 +0000 (17:04 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 12 Jan 2021 16:04:25 +0000 (17:04 +0100)

Trivial merge