Merge branch 'MDL-49987-master' of git://github.com/damyon/moodle

Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Andrew Nicols
2015-05-04 13:40:57 +08:00
2 changed files with 23 additions and 1 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2015050400.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2015050401.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.