Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle

Conflicts:
	version.php
This commit is contained in:
Damyon Wiese
2013-08-27 15:29:49 +08:00
30 changed files with 1460 additions and 1045 deletions
+3 -3
View File
@@ -29,11 +29,11 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013082700.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2013082700.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '2.6dev (Build: 20130823)'; // Human-friendly version name
$branch = '26'; // this version's branch
$maturity = MATURITY_ALPHA; // this version's maturity level
$branch = '26'; // This version's branch.
$maturity = MATURITY_ALPHA; // This version's maturity level.