Merge branch 'MDL-61389-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2020 22:29:28 +0000 (23:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2020 22:29:28 +0000 (23:29 +0100)

Trivial merge