Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 09:18:48 +0000 (10:18 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 09:18:48 +0000 (10:18 +0100)
1  2 
mod/workshop/lang/en/workshop.php

Simple merge