Merge branch 'MDL-70806-master' of git://github.com/ferranrecio/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Feb 2021 21:29:31 +0000 (22:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Feb 2021 21:29:31 +0000 (22:29 +0100)

Trivial merge