Merge branch 'MDL-50887-master' of https://github.com/lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 06:49:33 +0000 (14:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 06:49:33 +0000 (14:49 +0800)
1  2 
lib/deprecatedlib.php
lib/upgrade.txt
repository/upload/lib.php
version.php

Simple merge
diff --cc lib/upgrade.txt
Simple merge
Simple merge
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016030102.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016022500.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016030103.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.