Merge branch 'MDL-55957-master-workshopfiles' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 09:37:06 +0000 (10:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 09:37:06 +0000 (10:37 +0100)
commit03b2e3a04d633b9a0f54ed8bd069e77cbcb098e8
tree59e0d3d2070aad71be9a03e45aabf435822f8a67
parentd656122f8a1dfa29db4aec5d9dd54cd60b22864e
parent161131f057dbd06d3bd394ac8f543f1b833e3f75
Merge branch 'MDL-55957-master-workshopfiles' of git://github.com/mudrd8mz/moodle