Merge branch 'MDL-70143-310' of git://github.com/marinaglancy/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:51:54 +0000 (19:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:51:54 +0000 (19:51 +0100)

Trivial merge