Merge branch 'MDL-66169-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2019 22:47:23 +0000 (00:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2019 22:47:23 +0000 (00:47 +0200)

Trivial merge