Merge branch 'MDL-67511-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Mon, 3 Feb 2020 13:10:15 +0000 (14:10 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 3 Feb 2020 13:10:15 +0000 (14:10 +0100)

Trivial merge