Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 14:17:14 +0000 (14:17 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 14:17:14 +0000 (14:17 +0000)
1  2 
backup/util/dbops/restore_dbops.class.php
lib/adminlib.php
lib/db/upgrade.php
version.php

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