Merge branch 'MDL-70397-310' of git://github.com/andrewnicols/moodle into MOODLE_310_...
authorSara Arjona <sara@moodle.com>
Mon, 14 Dec 2020 16:12:05 +0000 (17:12 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 14 Dec 2020 16:12:05 +0000 (17:12 +0100)

Trivial merge