Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:55:42 +0000 (17:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 09:55:42 +0000 (17:55 +0800)
Conflicts:
lib/db/services.php

1  2 
lib/db/services.php

@@@ -1022,7 -1014,7 +1022,8 @@@ $services = array
              'core_group_get_course_user_groups',
              'core_user_remove_user_device',
              'core_course_get_courses',
 -            'mod_data_get_databases_by_courses',
 +            'core_completion_update_activity_completion_status_manually',
++            'mod_data_get_databases_by_courses'
              ),
          'enabled' => 0,
          'restrictedusers' => 0,