Merge branch 'MDL-69667-MOODLE_310_STABLE' of https://github.com/comete-upn/moodle...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Sep 2020 21:20:05 +0000 (23:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Sep 2020 21:20:05 +0000 (23:20 +0200)

Trivial merge