cakephp2-php8/cake
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
..
config Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00
console Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00
libs Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00
tests Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00
basics.php Merge branch '1.2' into 1.2-merger 2009-09-16 01:23:49 -04:00
bootstrap.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
dispatcher.php Merge branch '1.2' into 1.2-merger 2009-09-13 13:52:58 -04:00
LICENSE.txt closes #5271, removing root docs directory. adding README 2008-12-25 18:05:56 +00:00
VERSION.txt Merge branch '1.2' into 1.2-merger 2009-09-13 13:52:58 -04:00