Merge branch 'MDL-65213-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2019 22:22:54 +0000 (00:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2019 22:22:54 +0000 (00:22 +0200)

Trivial merge