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
console	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
libs	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
tests	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
basics.php	Merge branch '1.2' into 1.3	2009-08-03 13:13:18 -07:00
bootstrap.php	Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit.	2009-08-01 08:36:57 -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