cakephp2-php8/cake/tests/test_app
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
..
config Adding ini file and more tests for types. 2010-12-04 12:58:02 -05:00
console Moving more vendors/shells into console dirs. 2010-10-17 16:16:20 -04:00
controllers Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
libs Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
locale Adding po files omitted from previous commit. Refs #1085 2010-09-14 21:16:57 -04:00
models Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
plugins Merge branch '2.0-console' into 2.0 2010-11-02 23:49:19 -04:00
tmp updating file engine and test case 2008-06-24 01:09:54 +00:00
vendors Moving more vendors/shells into console dirs. 2010-10-17 16:16:20 -04:00
views Merge branch '1.3' into merger 2010-12-10 22:24:31 -05:00
webroot/theme/test_theme Adding more tests for theme assets 2009-11-27 10:27:15 -06:00