Merge branch 'MDL-68986-master' of git://github.com/merrill-oakland/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Wed, 10 Jun 2020 12:12:58 +0000 (13:12 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Wed, 10 Jun 2020 12:12:58 +0000 (13:12 +0100)

Trivial merge