cakephp2-php8/cake/tests/cases/libs/controller
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
component.test.php Adding two incomplete tests as they are not implemented. Pulling component tests out of the controller test case. 2010-06-12 18:47:47 -04:00
controller.test.php Merge branch '2.0' into 2.0-request 2010-06-28 23:41:48 -04:00
controller_merge_vars.test.php Fixing skips in ControllerMergeVarsTest. 2010-06-24 22:53:48 -04:00
pages_controller.test.php Merge branch '2.0' into 2.0-request 2010-06-27 23:21:11 -04:00
scaffold.test.php Merge branch '2.0' into 2.0-request 2010-06-27 23:21:11 -04:00