Merge branch 'MDL-70119-310' of git://github.com/ferranrecio/moodle into MOODLE_310_S...
authorSara Arjona <sara@moodle.com>
Wed, 4 Nov 2020 14:19:44 +0000 (15:19 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 4 Nov 2020 14:19:44 +0000 (15:19 +0100)

Trivial merge