Merge branch 'MDL-68641-master' of git://github.com/aanabit/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Thu, 4 Jun 2020 11:46:11 +0000 (12:46 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Thu, 4 Jun 2020 11:46:11 +0000 (12:46 +0100)

Trivial merge