Merge branch 'MDL-70896-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Mar 2021 23:34:05 +0000 (00:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Mar 2021 23:34:05 +0000 (00:34 +0100)

Trivial merge