Merge branch 'MDL-70584-310' of git://github.com/marinaglancy/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jan 2021 22:31:24 +0000 (23:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jan 2021 22:31:24 +0000 (23:31 +0100)

Trivial merge