cakephp2-php8/cake/tests/test_app/views
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
..
elements Merge branch '1.3' into merger 2010-12-10 22:24:31 -05:00
errors Moving Cake folder to correct location 2008-05-30 11:40:08 +00:00
helpers Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
layouts Changing <cake:nocache></cake:nocache> into <!--nocache--><!--/nocache--> This makes no cache tags valid html/xml at all times, and will not interfere with validation. 2010-11-07 13:23:45 -05:00
pages Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
posts Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
scaffolds Moving Cake folder to correct location 2008-05-30 11:40:08 +00:00
tests_apps Moving Cake folder to correct location 2008-05-30 11:40:08 +00:00
themed/test_theme Adding file omitted from [46948dd2c0] 2010-02-13 17:56:19 -05:00