Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:46:52 +0000 (10:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:46:52 +0000 (10:46 +0800)
Conflicts:
mod/scorm/version.php
version.php

1  2 
lib/db/services.php
mod/scorm/classes/external.php
mod/scorm/locallib.php
mod/scorm/tests/externallib_test.php
mod/scorm/version.php
version.php

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -24,7 -24,7 +24,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2015112700;    // The current module version (Date: YYYYMMDDXX).
 -$plugin->version   = 2015111601;    // The current module version (Date: YYYYMMDDXX).
++$plugin->version   = 2015112701;    // The current module version (Date: YYYYMMDDXX).
  $plugin->requires  = 2015111000;    // Requires this Moodle version.
  $plugin->component = 'mod_scorm';   // Full name of the plugin (used for diagnostics).
  $plugin->cron      = 300;
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2015122300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015120900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015122300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.