Merge branch 'MDL-69097-master' of https://github.com/inigozendegi/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Mar 2021 08:06:45 +0000 (09:06 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 3 Mar 2021 08:06:45 +0000 (09:06 +0100)

Trivial merge