mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 10:26:17 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	version.php
This commit is contained in:
Dan Poltawski 2014-09-30 08:35:19 +01:00
commit 216b6aa7ee
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/db/services.php
View File

@ -957,7 +957,8 @@ $services = array(
'core_grades_update_grades',
'mod_forum_get_forums_by_courses',
'mod_forum_get_forum_discussions',
'mod_forum_get_forum_discussion_posts'),
'mod_forum_get_forum_discussion_posts',
'core_files_get_files'),
'enabled' => 0,
'restrictedusers' => 0,
'shortname' => MOODLE_OFFICIAL_MOBILE_SERVICE,

2
version.php
View File

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