Merge branch 'MDL-69256-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Apr 2021 22:04:48 +0000 (00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Apr 2021 22:04:48 +0000 (00:04 +0200)

Trivial merge