Merge branch 'MDL-50015-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 23:42:06 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 23:42:06 +0000 (01:42 +0200)
1  2 
lib/db/services.php
version.php

@@@ -1161,17 -1160,7 +1161,18 @@@ $services = array
              'mod_page_view_page',
              'mod_resource_view_resource',
              'mod_folder_view_folder',
 +            'mod_chat_login_user',
 +            'mod_chat_get_chat_users',
 +            'mod_chat_send_chat_message',
 +            'mod_chat_get_chat_latest_messages',
 +            'mod_chat_view_chat',
 +            'mod_chat_get_chats_by_courses',
 +            'mod_book_view_book',
 +            'mod_choice_get_choice_results',
 +            'mod_choice_get_choice_options',
 +            'mod_choice_submit_choice_response',
 +            'mod_choice_view_choice',
+             'mod_imscp_view_imscp',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015090902.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015090300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015090903.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.