cakephp2-php8/cake/tests/test_app/plugins/test_plugin
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 Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
controllers Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
libs Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
locale/po fixes #6455, i18n locale message category bug 2009-07-03 15:54:26 +00:00
models Merge branch '1.3' into integration 2010-10-31 21:56:59 -04:00
vendors Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
views Merge branch '1.3' into integration 2010-10-13 22:30:40 -04:00
webroot Fixing delivery of plugin assets that reside in the root of a plugin webroot directory. Tests added. 2010-02-16 23:18:49 -05:00
test_plugin_app_controller.php Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00
test_plugin_app_model.php Fixing OpenTest license mentions to use MIT License 2010-10-03 12:31:21 -04:00