Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle

Conflicts:
	version.php
This commit is contained in:
Damyon Wiese 2013-07-16 15:14:49 +08:00
commit 924ea4845a
2 changed files with 2 additions and 2 deletions

View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013071500.02; // YYYYMMDD = weekly release date of this DEV branch
$version = 2013071600.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes