-
git://github.com/mudrd8mz/moodleDan Poltawski authored
Conflicts: mod/workshop/lang/en/workshop.php mod/workshop/version.php mod/workshop/db/upgrade.php
bb0bd8cb
Conflicts: mod/workshop/lang/en/workshop.php mod/workshop/version.php mod/workshop/db/upgrade.php