Merge branch 'MDL-70722-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Apr 2021 20:39:27 +0000 (22:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Apr 2021 20:39:27 +0000 (22:39 +0200)

Trivial merge