cakephp2-php8/cake/console/templates/skel/webroot
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 Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
img Moving shell templates dirs. 2009-07-26 01:29:08 -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 Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
css.php Merge branch '1.3' into 1.3-bake 2009-08-02 22:44:28 +02:00
favicon.ico Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
index.php Moving shell templates dirs. 2009-07-26 01:29:08 -04:00
test.php Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00