mark_story ecf7811b7a Merge branch '2.0' into 2.0-request ... Conflicts: cake/dispatcher.php cake/libs/controller/components/request_handler.php cake/libs/view/helpers/form.php cake/tests/cases/libs/controller/components/request_handler.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/view/helpers/js.test.php cake/tests/cases/libs/view/helpers/paginator.test.php		2010-06-27 23:21:11 -04:00
..
elements	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
errors	Adding omitted echo.	2010-05-29 00:20:16 -04:00
helpers	Merge branch '2.0' into 2.0-request	2010-06-27 23:21:11 -04:00
layouts	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
pages	Merge branch '1.3' into 2.0	2010-06-26 12:29:20 -04:00
scaffolds	Converted views, router and security classes to new translation shotcut function use.	2010-04-16 02:20:15 +10:00
helper.php	Merge branch '2.0' into 2.0-request	2010-06-27 23:21:11 -04:00
media.php	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
theme.php	Adding omitted documentation information.	2010-06-10 14:23:49 -04:00
view.php	Merge branch '2.0' into 2.0-request	2010-05-17 21:52:14 -04:00