Merge branch 'MDL-66743' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2019 20:26:53 +0000 (22:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2019 20:26:53 +0000 (22:26 +0200)

Trivial merge