Merge branch 'MDL-67751' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Wed, 15 Apr 2020 15:57:05 +0000 (17:57 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 15 Apr 2020 15:57:05 +0000 (17:57 +0200)

Trivial merge