Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 13:14:39 +0000 (21:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 13:14:39 +0000 (21:14 +0800)
Conflicts:
version.php

1  2 
lib/db/services.php
mod/forum/externallib.php
mod/forum/tests/externallib_test.php
version.php

@@@ -965,10 -956,9 +965,10 @@@ $services = array
              'core_grades_get_grades',
              'core_grades_update_grades',
              'mod_forum_get_forums_by_courses',
-             'mod_forum_get_forum_discussions',
+             'mod_forum_get_forum_discussions_paginated',
              'mod_forum_get_forum_discussion_posts',
 -            'core_files_get_files'),
 +            'core_files_get_files',
 +            'core_message_get_messages'),
          'enabled' => 0,
          'restrictedusers' => 0,
          'shortname' => MOODLE_OFFICIAL_MOBILE_SERVICE,
Simple merge
Simple merge
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2014100800.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2014100200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2014100800.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.