Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle

Conflicts:
	version.php
This commit is contained in:
Eloy Lafuente (stronk7) 2015-01-26 19:19:35 +01:00
commit 16dafa5d9f
6 changed files with 64 additions and 13 deletions

View file

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