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

Conflicts:
	version.php
This commit is contained in:
David Monllao
2015-03-10 15:50:13 +08:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -1006,6 +1006,7 @@ $services = array(
'gradereport_user_get_grades_table',
'core_group_get_course_user_groups',
'core_user_remove_user_device',
'core_course_get_courses'
),
'enabled' => 0,
'restrictedusers' => 0,
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2015030900.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2015030900.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.