Merge branch 'MDL-25660-workshop-calendar' of git://github.com/mudrd8mz/moodle
Conflicts: mod/workshop/lang/en/workshop.php mod/workshop/version.php mod/workshop/db/upgrade.php
Please register or sign in to comment
Conflicts: mod/workshop/lang/en/workshop.php mod/workshop/version.php mod/workshop/db/upgrade.php