Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:34:09 +0000 (14:34 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:34:09 +0000 (14:34 +0100)
Conflicts:
version.php

1  2 
theme/bootstrapbase/style/moodle.css
version.php

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