Merge branch 'MDL-68084' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 May 2020 23:30:28 +0000 (01:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 May 2020 23:30:28 +0000 (01:30 +0200)

Trivial merge