cakephp2-php8/cake/tests
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
..
cases Merge branch '2.0' into 2.0-request 2010-06-27 23:21:11 -04:00
fixtures Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
groups Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
lib Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
test_app Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00