Merge branch 'MDL-65528-master' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Wed, 15 May 2019 10:14:46 +0000 (12:14 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 15 May 2019 10:14:46 +0000 (12:14 +0200)

Trivial merge