Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle

Conflicts:
	lib/db/services.php
	version.php
This commit is contained in:
Dan Poltawski
2015-04-07 10:03:28 +01:00
4 changed files with 149 additions and 1 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2015040600.01; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2015040700.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.