cakephp2-php8/app/config
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
..
schema Removing raw .sql files from app/config, renaming sql/ => schema/ 2009-02-06 11:37:28 -05:00
acl.ini.php changing tabs for spaces in comment block indentation 2008-10-30 17:30:26 +00:00
bootstrap.php Merge branch '1.3-inflector' into 1.3 2009-08-01 23:53:36 -07:00
core.php Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00
database.php.default merging 1.3-misc into master 2009-05-01 14:05:46 -07:00
routes.php changing tabs for spaces in comment block indentation 2008-10-30 17:30:26 +00:00