Merge branch 'MDL-70408-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Jan 2021 22:59:36 +0000 (23:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Jan 2021 22:59:36 +0000 (23:59 +0100)

Trivial merge