Merge branch 'MDL-70102-master' of https://github.com/sammarshallou/moodle
authorSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 14:50:08 +0000 (15:50 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 14:50:08 +0000 (15:50 +0100)

Trivial merge