Merge branch 'wip-MDL-65220-master' of https://github.com/jason-platts/moodle
authorDavid Monllaó <davidm@moodle.com>
Mon, 15 Apr 2019 05:57:27 +0000 (07:57 +0200)
committerDavid Monllaó <davidm@moodle.com>
Mon, 15 Apr 2019 05:57:27 +0000 (07:57 +0200)

Trivial merge