Merge branch 'MDL-65207-master' of git://github.com/lameze/moodle
authorDavid Monllaó <davidm@moodle.com>
Wed, 24 Apr 2019 15:52:10 +0000 (17:52 +0200)
committerDavid Monllaó <davidm@moodle.com>
Wed, 24 Apr 2019 15:52:10 +0000 (17:52 +0200)

Trivial merge