Merge branch 'MDL-70802-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Apr 2021 16:30:13 +0000 (18:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Apr 2021 16:30:13 +0000 (18:30 +0200)

Trivial merge