Merge branch 'MDL-69086-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2020 17:15:13 +0000 (19:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2020 17:15:13 +0000 (19:15 +0200)

Trivial merge