Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle

Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
This commit is contained in:
Sam Hemelryk
2014-10-07 16:28:50 +13:00
21 changed files with 1909 additions and 3 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2014100600.04; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2014100700.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.