José Lorenzo Rodríguez 4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading ... Conflicts: cake/bootstrap.php cake/libs/view/helpers/js.php lib/Cake/Model/AclNode.php lib/Cake/Model/ConnectionManager.php lib/Cake/bootstrap.php lib/Cake/tests/cases/libs/controller/controller.test.php		2011-01-02 02:00:03 -04:30
..
css	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
files	Adding empty files to directories that were previously omitted.	2009-09-20 18:03:42 -04:00
img	Updating CSS file and making a nicer cake icon.	2009-12-28 23:13:04 -05:00
js	Removing webroot/js/vendors.php. These files are no longer needed as Dispatcher can handle serving js files from vendors directories. Adding empty files to empty directories. Refs #50	2009-09-13 23:32:27 -04:00
.htaccess	Merging fixes and enhancements into trunk	2006-01-20 07:46:14 +00:00
css.php	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00
favicon.ico	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00:00
index.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
test.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30