Merge branch 'MDL-32919-core_course_import_course' of git://github.com/jleyva/moodle

Conflicts:
	version.php
This commit is contained in:
Sam Hemelryk
2012-07-17 17:38:16 +12:00
3 changed files with 193 additions and 1 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012071200.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2012071700.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes