cakephp2-php8/cake/tests
mark_story b9f0fc0724 Merge branch '1.3' into merger
Conflicts:
	cake/dispatcher.php
	cake/libs/cake_session.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/set.php
	cake/libs/validation.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/view.test.php
2010-12-10 22:24:31 -05:00
..
cases Merge branch '1.3' into merger 2010-12-10 22:24:31 -05:00
fixtures Fixing acl testcase so it runs smoothly on postgres 2010-11-16 01:22:29 -04:30
lib Merge branch '1.3' into merger 2010-12-10 22:24:31 -05:00
test_app Merge branch '1.3' into merger 2010-12-10 22:24:31 -05:00