Merge branch 'master_MDL-67497' of https://github.com/danmarsden/moodle
authorSara Arjona <sara@moodle.com>
Thu, 21 May 2020 17:00:01 +0000 (19:00 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 21 May 2020 17:00:26 +0000 (19:00 +0200)
1  2 
lib/db/access.php
version.php

Simple merge
diff --cc version.php
@@@ -29,9 -29,9 +29,9 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2020052000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2020042800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2020052000.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
 -$release  = '3.9dev+ (Build: 20200428)'; // Human-friendly version name
 +$release  = '3.9dev+ (Build: 20200519)'; // Human-friendly version name
  $branch   = '39';                       // This version's branch.
  $maturity = MATURITY_ALPHA;             // This version's maturity level.