Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 01:14:00 +0000 (02:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Mar 2014 01:14:00 +0000 (02:14 +0100)
Conflicts:
version.php

1  2 
version.php

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