Merge branch 'MDL-68263-master' of git://github.com/mihailges/moodle
authorSara Arjona <sara@moodle.com>
Wed, 1 Apr 2020 06:58:27 +0000 (08:58 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 1 Apr 2020 06:58:27 +0000 (08:58 +0200)

Trivial merge