cakephp2-php8/cake/tests/cases
mark_story 326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
..
console Merge branch '1.3-console' into 1.3 2009-08-14 12:32:54 -04:00
libs Merge branch '1.2' into 1.2-merger 2009-09-13 13:52:58 -04:00
basics.test.php Merge branch '1.2' into 1.3 2009-08-03 13:13:18 -07:00
dispatcher.test.php Merge branch '1.2' into 1.2-merger 2009-09-13 13:52:58 -04:00