Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:23:33 +0000 (16:23 +0800)
Conflicts:
version.php

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

diff --combined lib/db/services.php
@@@ -1168,12 -1168,12 +1168,13 @@@ $services = array
              'core_enrol_get_users_courses',
              'core_enrol_get_enrolled_users',
              'core_enrol_get_course_enrolment_methods',
+             'enrol_guest_get_instance_info',
              'enrol_self_enrol_user',
              'enrol_self_get_instance_info',
              'core_user_get_users_by_id',
              'core_webservice_get_site_info',
              'core_notes_create_notes',
 +            'core_notes_delete_notes',
              'core_user_get_course_user_profiles',
              'core_message_send_instant_messages',
              'mod_assign_get_grades',
diff --combined version.php
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015122100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015120900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015122100.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  
 -$release  = '3.1dev (Build: 20151209)'; // Human-friendly version name
 +$release  = '3.1dev (Build: 20151218)'; // Human-friendly version name
  
  $branch   = '31';                       // This version's branch.
  $maturity = MATURITY_ALPHA;             // This version's maturity level.