Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle

Conflicts:
	mod/scorm/version.php
	version.php
This commit is contained in:
David Monllao
2015-12-29 10:46:52 +08:00
8 changed files with 267 additions and 92 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2015122300.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2015122300.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.