Merge branch 'MDL-68244' of https://github.com/Chocolate-lightning/moodle
authorSara Arjona <sara@moodle.com>
Thu, 28 May 2020 10:42:39 +0000 (12:42 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 28 May 2020 10:42:39 +0000 (12:42 +0200)

Trivial merge