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)
commit58fcd0a0ed89af49209be388120751304030d292
treeeb56d00351f8aa46a61411777dc719017b5f6887
parent229c5ec14fc172d1d28c3bf7164f80121dda5aa3
parentfd8fe9c1dbc432e1f8ddd737bcd4e3fd94cfe6ea
Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle
mod/workshop/lang/en/workshop.php