Merge branch 'MDL-68654-master' of https://github.com/catalyst/moodle
authorSara Arjona <sara@moodle.com>
Mon, 11 May 2020 17:16:14 +0000 (19:16 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 11 May 2020 17:16:14 +0000 (19:16 +0200)

Trivial merge