Merge branch 'MDL-63748-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Nov 2018 12:11:17 +0000 (13:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Nov 2018 12:11:17 +0000 (13:11 +0100)

Trivial merge