cakephp2-php8/cake/tests/test_app/views/elements/email/html
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
..
custom.ctp Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
default.ctp Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
nested_element.ctp Adding test cases for using helpers in nested elements from email 2010-12-09 22:34:20 -05:00