Merge branch 'dashboard-split-overview-block' of https://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Sep 2018 06:08:55 +0000 (14:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Sep 2018 06:08:55 +0000 (14:08 +0800)
1  2 
course/lib.php
course/tests/courselib_test.php
lib/enrollib.php
lib/navigationlib.php
theme/boost/scss/moodle/core.scss
theme/boost/style/moodle.css
theme/bootstrapbase/style/moodle.css
version.php

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