Merge branch 'MDL-65878-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 18:07:48 +0000 (20:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2019 18:07:48 +0000 (20:07 +0200)

Trivial merge