Merge branch 'MDL-59382-master-4' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Aug 2017 01:31:44 +0000 (09:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Aug 2017 01:31:44 +0000 (09:31 +0800)
1  2 
blocks/calendar_month/tests/behat/block_calendar_month.feature
lang/en/moodle.php
theme/bootstrapbase/style/moodle.css
version.php

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