Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github...
authorSam Hemelryk <sam@moodle.com>
Tue, 2 Dec 2014 19:40:37 +0000 (08:40 +1300)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:26 +0000 (12:14 +0000)
commit101348192bf03cc3cb1ac99bb4a5220e219307c9
tree35a46c820a83e644e53993ae8effabbd7d3b31c7
parent13e03009615cf8de5622b53f54a25aef3b671700
parentc57617dac175127613bd5fc43b9ba40a7dcb93c0
Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle

Conflicts:
mod/imscp/module.js
mod/imscp/db/upgrade.php
mod/imscp/module.js