Merge branch 'MDL-70409-310' of git://github.com/merrill-oakland/moodle into MOODLE_3...
authorSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:15:50 +0000 (16:15 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:15:50 +0000 (16:15 +0100)

Trivial merge