Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 03:59:33 +0000 (11:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 1 Apr 2015 03:59:33 +0000 (11:59 +0800)
Conflicts:
lib/db/services.php

1  2 
lib/db/services.php

@@@ -1034,8 -1033,7 +1043,9 @@@ $services = array
              'core_course_get_courses',
              'core_completion_update_activity_completion_status_manually',
              'mod_data_get_databases_by_courses',
 +            'core_comment_get_comments',
 +            'mod_forum_view_forum',
+             'core_course_view_course',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,