Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:06:20 +0000 (11:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:06:20 +0000 (11:06 +0200)
Conflicts:
lib/db/services.php
version.php

1  2 
lib/db/services.php

@@@ -1054,10 -1032,7 +1062,11 @@@ $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',
 +            'core_completion_get_activities_completion_status',
+             'core_notes_get_course_notes',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,