Merge branch 'MDL-65412-master' of http://github.com/dravek/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Apr 2019 18:02:47 +0000 (20:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Apr 2019 18:02:47 +0000 (20:02 +0200)

Trivial merge