Merge branch 'MDL-71113-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 19 Jun 2021 15:57:13 +0000 (17:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 19 Jun 2021 15:57:13 +0000 (17:57 +0200)

Trivial merge