Merge branch 'MDL-68905-master' of git://github.com/sarjona/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Thu, 4 Jun 2020 15:22:10 +0000 (16:22 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Thu, 4 Jun 2020 15:22:10 +0000 (16:22 +0100)

Trivial merge