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

Trivial merge