Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Dan Poltawski
2013-02-18 11:33:00 +08:00
3 changed files with 29 additions and 1 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012120301.09; // 20121203 = branching date YYYYMMDD - do not modify!
$version = 2012120301.10; // 20121203 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes