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
This commit is contained in:
Dan Poltawski 2012-04-17 16:29:27 +08:00
commit bb0bd8cb58
4 changed files with 148 additions and 1 deletions

View file

@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$module->version = 2012033100; // the current module version (YYYYMMDDXX)
$module->version = 2012041701; // the current module version (YYYYMMDDXX)
$module->requires = 2012032300; // requires this Moodle version
$module->component = 'mod_workshop'; // full name of the plugin (used for diagnostics)
$module->cron = 60; // give as a chance every minute