Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle

Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Damyon Wiese
2013-03-26 15:13:35 +08:00
3 changed files with 19 additions and 1 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013032600.02; // YYYYMMDD = weekly release date of this DEV branch
$version = 2013032600.03; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes