Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 12 Jul 2017 11:22:32 +0000 (12:22 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 12 Jul 2017 11:22:32 +0000 (12:22 +0100)
commiteff0303ad853161fa7dfe16c0242cb4d542052f2
treee4c88b14d3621f187c832190d130c033ef2c9be9
parentd4a87aa3702c78ca817d886a2042be8d083714f0
parent6218889e2d93dfa2a89cf30a53fdb45502d644a5
Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle