Merge branch 'MDL-68866-master' of https://github.com/mchurchward/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2020 22:13:56 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2020 22:13:56 +0000 (00:13 +0200)

Trivial merge