cakephp2-php8/cake/tests/test_app
Mark Story 08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
..
config Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -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 '1.3' into integration 2010-10-31 21:56:59 -04:00
tmp updating file engine and test case 2008-06-24 01:09:54 +00:00
vendors Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
views Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
webroot/theme/test_theme Adding more tests for theme assets 2009-11-27 10:27:15 -06:00