ADmad 3303a2cda1 Merge branch 'master' into 2.4 ... Conflicts: lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php lib/Cake/Console/Templates/skel/Config/Schema/i18n.php lib/Cake/Console/Templates/skel/Config/Schema/sessions.php lib/Cake/Console/Templates/skel/Config/acl.ini.php lib/Cake/Console/Templates/skel/Config/acl.php lib/Cake/Console/Templates/skel/Config/bootstrap.php lib/Cake/Console/Templates/skel/Config/core.php lib/Cake/Console/Templates/skel/Config/database.php.default lib/Cake/Console/Templates/skel/Config/email.php.default lib/Cake/Console/Templates/skel/Config/routes.php lib/Cake/Console/Templates/skel/Console/Command/AppShell.php lib/Cake/Console/Templates/skel/Console/cake.bat lib/Cake/Console/Templates/skel/Console/cake.php lib/Cake/Console/Templates/skel/Controller/AppController.php lib/Cake/Console/Templates/skel/Controller/PagesController.php lib/Cake/Console/Templates/skel/Model/AppModel.php lib/Cake/Console/Templates/skel/View/Errors/error400.ctp lib/Cake/Console/Templates/skel/View/Errors/error500.ctp lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp lib/Cake/Console/Templates/skel/View/Layouts/default.ctp lib/Cake/Console/Templates/skel/View/Layouts/error.ctp lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp lib/Cake/Console/Templates/skel/View/Pages/home.ctp lib/Cake/Console/Templates/skel/index.php lib/Cake/Console/Templates/skel/webroot/index.php lib/Cake/Console/Templates/skel/webroot/test.php		2013-06-02 18:03:59 +05:30
..
Config	Merge branch 'master' into 2.4	2013-06-02 18:03:59 +05:30
Console	Merge branch 'master' into 2.4	2013-06-02 18:03:59 +05:30
Controller	Merge branch 'master' into 2.4	2013-06-02 18:03:59 +05:30
Lib	Camelized templates folder.	2011-05-30 23:02:39 -04:00
Locale/eng/LC_MESSAGES	Camelized templates folder.	2011-05-30 23:02:39 -04:00
Model	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Plugin	Camelized templates folder.	2011-05-30 23:02:39 -04:00
Test	removing 'empty' files from nonempty directories	2011-10-19 12:19:28 +07:00
tmp	Camelized templates folder.	2011-05-30 23:02:39 -04:00
Vendor	Camelized templates folder.	2011-05-30 23:02:39 -04:00
View	Merge branch 'master' into 2.4	2013-06-02 18:03:59 +05:30
webroot	Merge branch 'master' into 2.4	2013-06-02 18:03:59 +05:30
.htaccess	Remove extraneous space in .htaccess	2012-02-17 21:32:09 -08:00
index.php	Merge branch 'master' into 2.4	2013-06-02 18:03:59 +05:30