Merge branch 'MDL-66570-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Sep 2019 13:56:38 +0000 (15:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Sep 2019 13:56:38 +0000 (15:56 +0200)
1  2 
lang/en/admin.php
version.php

Simple merge
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2019092000.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2019091700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2019092000.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.