Merge branch 'MDL-53170_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 May 2016 16:54:57 +0000 (18:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 May 2016 16:54:57 +0000 (18:54 +0200)
1  2 
version.php

diff --combined version.php
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016051000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016050600.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016051000.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  
 -$release  = '3.1beta+ (Build: 20160506)'; // Human-friendly version name
 +$release  = '3.1beta+ (Build: 20160510)'; // Human-friendly version name
  
  $branch   = '31';                       // This version's branch.
  $maturity = MATURITY_BETA;             // This version's maturity level.