mark_story 734bb9223b Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Core/App.php lib/Cake/VERSION.txt		2014-09-06 23:04:20 -04:00
..
css	Added display of CakePHP version to the default layout	2013-10-16 02:07:59 +02:00
files	Adding empty files to directories that were previously omitted.	2009-09-20 18:03:42 -04:00
img	Adding testsuite icons to the repo, so they are local assets instead of remote ones.	2011-05-22 09:15:04 -04: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	use a simpler rewrite rule	2013-07-13 16:18:48 +00:00
favicon.ico	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00:00
index.php	Auto-detect composer installed CakePHP folder.	2014-08-05 03:53:40 +02:00
test.php	Merge branch 'master' into 2.6	2014-09-06 23:04:20 -04:00