Merge branch 'MDL-69060-master' of git://github.com/lucaboesch/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Wed, 17 Jun 2020 22:38:15 +0000 (23:38 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Wed, 17 Jun 2020 22:38:15 +0000 (23:38 +0100)

Trivial merge