Merge branch 'MDL-65006-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2019 22:35:17 +0000 (23:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2019 22:35:17 +0000 (23:35 +0100)

Trivial merge