Merge branch 'MDL-67920-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 22:32:17 +0000 (23:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Feb 2020 22:32:17 +0000 (23:32 +0100)

Trivial merge