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
..
cases	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
fixtures	Fixing whitespacing on aco_fixture.	2009-08-05 00:23:59 -04:00
groups	Merge branch '1.3' into 1.3-jshelper	2009-08-03 14:39:21 -04:00
lib	Fixing deprecation error due to changes in API	2009-09-10 22:56:44 -04:00
test_app	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00