cakephp2-php8/app
Jose Lorenzo Rodriguez 000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
..
config Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
Console Partial migration of folders to camelcase in app 2011-03-22 00:46:51 -04:30
Controller/Component Partial migration of folders to camelcase in app 2011-03-22 00:46:51 -04:30
Lib Partial migration of folders to camelcase in app 2011-03-22 00:46:51 -04:30
locale/eng/LC_MESSAGES Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
Model Partial migration of folders to camelcase in app 2011-03-22 00:46:51 -04:30
plugins Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
tests Renaming folders in app tests 2011-04-10 21:00:51 -04:30
tmp fix file permissions 2011-03-16 16:06:44 +01:00
vendors/shells Removing unused folders from app/vendors 2007-10-18 16:51:16 +00:00
View Partial migration of folders to camelcase in app 2011-03-22 00:46:51 -04:30
webroot Merge branch '2.0-class-loading' into 2.0-translations 2011-03-16 12:29:39 +01:00
.htaccess Merging fixes and enhancements into trunk 2006-02-18 23:42:21 +00:00
index.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00