Merge branch 'MDL-50013-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Sep 2015 14:21:27 +0000 (15:21 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Sep 2015 14:21:27 +0000 (15:21 +0100)
1  2 
lib/db/services.php
version.php

@@@ -1160,11 -1160,7 +1160,12 @@@ $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_book_view_book',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015090802.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015090300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015090803.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.