Merge branch 'MDL-68231-master' of https://github.com/snake/moodle
authorSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 11:22:18 +0000 (13:22 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 11:22:18 +0000 (13:22 +0200)

Trivial merge