cakephp2-php8/app
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 Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
Controller Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
Lib Partial migration of folders to camelcase in app 2011-03-22 00:46:51 -04:30
Locale/eng/LC_MESSAGES Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30
Model Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
Plugin Starting unification of casing in remaining folders 2011-05-13 01:53:49 -04:30
Test removing 'empty' files from nonempty directories 2011-10-19 12:19:28 +07:00
tmp fix file permissions 2011-03-16 16:06:44 +01:00
Vendor Adding missing Vendor directory. 2011-07-28 16:31:19 -04:00
View Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
webroot Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00
.htaccess Remove extraneous space in .htaccess 2012-02-17 21:32:09 -08:00
index.php Improved the DocBlocks and other code cleanup 2013-05-31 00:11:19 +02:00