Merge branch 'MDL-61121-master-5' of git://github.com/mihailges/moodle
authorSara Arjona <sara@moodle.com>
Mon, 21 Oct 2019 12:46:17 +0000 (14:46 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 21 Oct 2019 12:46:17 +0000 (14:46 +0200)

Trivial merge