Merge branch 'MDL-68388' of https://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Tue, 26 May 2020 18:03:22 +0000 (20:03 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 26 May 2020 18:03:22 +0000 (20:03 +0200)

Trivial merge