Merge branch 'MDL-68854-master' of git://github.com/vmdef/moodle
authorSara Arjona <sara@moodle.com>
Thu, 28 May 2020 16:11:35 +0000 (18:11 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 28 May 2020 16:11:35 +0000 (18:11 +0200)

Trivial merge