Merge branch 'MDL-68076-master-4' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 Jun 2020 02:04:58 +0000 (10:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 Jun 2020 02:04:58 +0000 (10:04 +0800)
1  2 
lang/en/moodle.php
lib/db/services.php
theme/boost/scss/moodle/core.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css
version.php

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