Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle

Conflicts: version.php
ragusa87 · Jul 16, 2013 · 924ea48 · 924ea48
2 parents 3e2b573 + 7809d15
commit 924ea48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/setuplib.php b/lib/setuplib.php
@@ -1165,7 +1165,7 @@ function disable_output_buffering() {
  */
 function redirect_if_major_upgrade_required() {
     global $CFG;
-    $lastmajordbchanges = 2013070400.00;
+    $lastmajordbchanges = 2013071600.00;
     if (empty($CFG->version) or (float)$CFG->version < $lastmajordbchanges or
             during_initial_install() or !empty($CFG->adminsetuppending)) {
         try {

diff --git a/version.php b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2013071500.02;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2013071600.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes