Merge branch 'MDL-68314-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 May 2020 11:15:17 +0000 (13:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 May 2020 11:15:17 +0000 (13:15 +0200)

Trivial merge