Merge branch 'MDL-51225-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jan 2020 10:13:33 +0000 (11:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jan 2020 10:13:33 +0000 (11:13 +0100)

Trivial merge