Merge branch 'MDL-69278-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 18 Jul 2020 09:56:01 +0000 (11:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 18 Jul 2020 09:56:01 +0000 (11:56 +0200)

Trivial merge