Merge branch 'MDL-70023-master' of git://github.com/marinaglancy/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2020 22:57:15 +0000 (23:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2020 22:57:15 +0000 (23:57 +0100)

Trivial merge