Merge branch 'MDL-70394-310' of git://github.com/rezaies/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 14:31:26 +0000 (15:31 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 14:31:26 +0000 (15:31 +0100)

Trivial merge