Merge branch 'MDL-70789' of git://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Mar 2021 22:52:16 +0000 (23:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Mar 2021 22:52:16 +0000 (23:52 +0100)

Trivial merge