Merge branch 'MDL-66115_master' of https://github.com/dvdcastro/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jul 2019 21:08:53 +0000 (23:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jul 2019 21:08:53 +0000 (23:08 +0200)

Trivial merge