Merge branch 'MDL-67410-master' of https://github.com/felicemcc/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Dec 2019 18:18:03 +0000 (19:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Dec 2019 18:18:03 +0000 (19:18 +0100)

Trivial merge