Merge branch 'MDL-60820-master-workshopsubmissiontypes' of git://github.com/mudrd8mz...
authorDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 11:07:00 +0000 (13:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 11:07:00 +0000 (13:07 +0200)

Trivial merge