Merge branch 'MDL-66807_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 Oct 2019 23:08:16 +0000 (00:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 Oct 2019 23:08:16 +0000 (00:08 +0100)

Trivial merge