mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 08:22:07 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	version.php
This commit is contained in:
Damyon Wiese 2014-02-25 10:26:22 +08:00
commit b33fbd428e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/db/services.php
View File

@ -906,7 +906,15 @@ $services = array(
'core_course_get_contents',
'core_get_component_strings',
'core_user_add_user_device',
'core_calendar_get_calendar_events'),
'core_calendar_get_calendar_events',
'core_enrol_get_users_courses',
'core_enrol_get_enrolled_users',
'core_user_get_users_by_id',
'core_webservice_get_site_info',
'core_notes_create_notes',
'core_user_get_course_user_profiles',
'core_enrol_get_enrolled_users',
'core_message_send_instant_messages'),
'enabled' => 0,
'restrictedusers' => 0,
'shortname' => MOODLE_OFFICIAL_MOBILE_SERVICE,

2
version.php
View File

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