Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle

Conflicts: lib/db/upgrade.php version.php
2012-07-24 14:07:26 +08:00
parent 1011757205 13725b3797
commit b7db7803bc
15 changed files with 65 additions and 94 deletions
@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();


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