Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle

Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
This commit is contained in:
Sam Hemelryk
2013-10-09 15:58:45 +13:00
20 changed files with 465 additions and 344 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013100800.02; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2013100900.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.