Merge branch 'MDL-69582-310' of git://github.com/ferranrecio/moodle into MOODLE_310_S...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Oct 2020 20:44:29 +0000 (22:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Oct 2020 20:44:29 +0000 (22:44 +0200)

Trivial merge