Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)
Conflicts:
version.php

lib/db/services.php
version.php

index 261495a..6b7130b 100644 (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,
index fe00e01..3721b18 100644 (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.