Merge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd...
authorDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 08:15:27 +0000 (16:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 08:15:27 +0000 (16:15 +0800)
commitc3717ca64e72f8c9015247eb7321996465884252
treecded3d95d13579fd62a02991706e44890dac1619
parent9b44810fbfd4a65574a2a1a9066e8fa4c7863239
parent996f7e8228f7547ad006ceb1489d3f841bb00433
Merge branch 'MDL-50794-master-workshop-restrict-filetypes' of git://github.com/mudrd8mz/moodle