mark_story 5717e3b59c Merge branch '1.2' into 1.2-merger ... Conflicts: app/webroot/test.php cake/VERSION.txt cake/bootstrap.php cake/config/config.php cake/console/cake.php cake/console/libs/schema.php cake/console/templates/skel/webroot/test.php cake/libs/configure.php cake/tests/cases/console/libs/schema.test.php cake/tests/cases/libs/debugger.test.php cake/tests/cases/libs/model/model_write.test.php cake/tests/fixtures/aco_fixture.php		2009-09-16 01:23:49 -04:00
..
css	changing tabs for spaces in comment block indentation	2008-10-30 17:30:26 +00:00
img	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00: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	Applying patch from 'ruben' updates Date header to comply with RFC 822 and RFC 1123. Fixes #6102	2009-02-16 01:05:53 +00:00
favicon.ico	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00:00
index.php	Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit.	2009-09-07 15:12:39 -04:00
test.php	Merge branch '1.2' into 1.2-merger	2009-09-16 01:23:49 -04:00