Merge branch 'MDL-65281' of git://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Mon, 15 Apr 2019 11:13:14 +0000 (13:13 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 15 Apr 2019 11:13:14 +0000 (13:13 +0200)

Trivial merge