Merge branch 'MDL-69776-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 04:33:51 +0000 (12:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Oct 2020 04:33:51 +0000 (12:33 +0800)
1  2 
lib/db/services.php
version.php

Simple merge
diff --cc version.php
@@@ -29,9 -29,9 +29,9 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2020100900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2020092400.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2020100900.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
 -$release  = '3.10dev (Build: 20200924)';// Human-friendly version name
 +$release  = '3.10dev+ (Build: 20201009)';// Human-friendly version name
  $branch   = '310';                      // This version's branch.
  $maturity = MATURITY_ALPHA;             // This version's maturity level.