cakephp2-php8/app
José Lorenzo Rodríguez 4cebe55a9b Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	app/webroot/index.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/tests/cases/libs/controller/components/auth.test.php
2011-02-21 22:28:30 -04:30
..
config Reducing code related to CakeSchema. Fixes #1477 2011-01-29 17:26:08 -05:00
console Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-02-21 22:28:30 -04:30
controllers/components Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
libs Adding app/libs dir. app/libs is for storing 1st party libraries that are not technically vendor files, as they do not originate from vendor sources. 2009-10-28 09:16:09 -04:00
locale/eng/LC_MESSAGES Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
models Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
plugins Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
tests Adding empty file to all empty directories 2007-05-06 03:09:27 +00:00
tmp Re-adding file delete by error 2010-02-27 23:38:46 -04:30
vendors/shells Removing unused folders from app/vendors 2007-10-18 16:51:16 +00:00
views Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
webroot Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-02-21 22:28:30 -04:30
.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