Merge branch 'MDL-49500-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 15:44:41 +0000 (16:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 15:44:41 +0000 (16:44 +0100)
Conflicts:
lib/db/services.php
version.php

1  2 
lib/db/services.php
version.php

@@@ -1110,12 -1068,7 +1110,13 @@@ $services = array
              'core_course_view_course',
              'core_completion_get_activities_completion_status',
              'core_notes_get_course_notes',
 +            'core_completion_get_course_completion_status',
 +            'core_user_view_user_list',
 +            'core_message_mark_message_read',
 +            'core_notes_view_notes',
 +            'mod_forum_view_forum_discussion',
 +            'core_user_view_user_profile',
+             'gradereport_user_view_grade_report',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015040200.04;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015040200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015040200.05;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.