Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:00:49 +0000 (20:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 18:00:49 +0000 (20:00 +0200)
Conflicts:
lib/db/services.php
version.php

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

@@@ -267,8 -258,7 +267,8 @@@ $services = array
              'moodle_webservice_get_siteinfo',
              'moodle_notes_create_notes',
              'moodle_user_get_course_participants_by_id',
-             'moodle_message_send_messages'),
 +            'moodle_user_get_users_by_courseid',
+             'moodle_message_send_instantmessages'),
          'enabled' => 0,
          'restrictedusers' => 0,
          'shortname' => MOODLE_OFFICIAL_MOBILE_SERVICE
diff --cc version.php
@@@ -31,7 -31,7 +31,7 @@@ defined('MOODLE_INTERNAL') || die()
  
  
  
- $version  = 2011062700.03;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2011062700.02;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2011062700.04;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes