Merge branch 'MDL-69762_master' of https://github.com/grillonbleu/moodle
authorSara Arjona <sara@moodle.com>
Tue, 16 Feb 2021 14:29:34 +0000 (15:29 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 16 Feb 2021 14:29:34 +0000 (15:29 +0100)

Trivial merge