Merge branch 'MDL-68721-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Mar 2021 16:51:16 +0000 (17:51 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 3 Mar 2021 16:51:16 +0000 (17:51 +0100)

Trivial merge