Merge branch 'MDL-67862-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 11:09:33 +0000 (12:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 11:09:33 +0000 (12:09 +0100)

Trivial merge