Merge branch 'MDL-67523-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 29 Dec 2019 22:31:59 +0000 (23:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 29 Dec 2019 22:31:59 +0000 (23:31 +0100)

Trivial merge