Merge branch 'MDL-62836-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2019 21:56:39 +0000 (23:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2019 21:56:39 +0000 (23:56 +0200)

Trivial merge