Merge branch 'MDL-70063-310-1' of git://github.com/mihailges/moodle into MOODLE_310_S...
authorSara Arjona <sara@moodle.com>
Wed, 11 Nov 2020 15:30:21 +0000 (16:30 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 11 Nov 2020 15:30:21 +0000 (16:30 +0100)

Trivial merge