Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle

Conflicts:
	version.php
    lib/db/upgrade.php
This commit is contained in:
Dan Poltawski
2012-05-28 14:32:16 +08:00
2 changed files with 38 additions and 1 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012052500.02; // YYYYMMDD = weekly release date of this DEV branch
$version = 2012052500.03; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes