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

Trivial merge