Merge branch 'MDL-69134-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jul 2020 18:53:11 +0000 (20:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jul 2020 18:53:11 +0000 (20:53 +0200)

Trivial merge