Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle

Conflicts: version.php
2013-07-23 10:37:20 +08:00
parent deeae9c155 de685c7d25
commit 9ced78bd3e
10 changed files with 229 additions and 59 deletions
@@ -29,7 +29,7 @@

 defined('MOODLE_INTERNAL') || die();

-$version  = 2013071900.02;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2013072300.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                        //         RR    = release increments - 00 in DEV branches
                                        //           .XX = incremental changes