Merge branch 'MDL-66312-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Aug 2019 17:38:45 +0000 (19:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Aug 2019 17:38:45 +0000 (19:38 +0200)

Trivial merge