mark_story 7c0cda7ce5 Merge branch '2.0' into 2.0-request ... Conflicts: cake/libs/router.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/controller/components/auth.test.php cake/tests/cases/libs/controller/components/request_handler.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/router.test.php cake/tests/cases/libs/view/helpers/html.test.php cake/tests/cases/libs/view/helpers/js.test.php		2010-06-28 23:41:48 -04:00
..
components	Merge branch '2.0' into 2.0-request	2010-06-28 23:41:48 -04:00
app_controller.php	Numerous 'shoer description' documentation entries updated to contain useful comments.	2010-05-30 01:20:28 +10:00
component.php	Merge remote branch 'origin/1.3' into 2.0	2010-05-20 12:22:04 +10:00
controller.php	Merge branch '2.0' into 2.0-request	2010-06-27 23:21:11 -04:00
pages_controller.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
scaffold.php	Merge branch '2.0-phpunit' into 2.0	2010-06-28 22:31:35 -04:00