Merge branch 'MOODLE_310_MDL-70520' of https://github.com/golenkovm/moodle into MOODL...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jan 2021 23:19:12 +0000 (00:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jan 2021 23:19:12 +0000 (00:19 +0100)

Trivial merge