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
..
config	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
controllers	Merge branch '1.3' into 1.3-newlines	2009-07-25 10:41:40 -07:00
locale	fixes #6455, i18n locale message category bug	2009-07-03 15:54:26 +00:00
models	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
plugins	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
tmp	updating file engine and test case	2008-06-24 01:09:54 +00:00
vendors	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
views	Updating SessionHelper::flash() to use elements for custom flash wrapping html instead of layouts.	2009-09-01 00:03:56 -04:00