Merge branch 'MDL-65197' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 May 2019 18:01:54 +0000 (20:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 May 2019 18:01:54 +0000 (20:01 +0200)

Trivial merge