cakephp2-php8/cake/tests/test_app/plugins/test_plugin
mark_story 929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
..
config Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
controllers Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
libs Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10:00
locale/po fixes #6455, i18n locale message category bug 2009-07-03 15:54:26 +00:00
models Merge branch '1.3' into 2.0 2010-06-26 12:29:20 -04:00
vendors Update various links. Closes #392 2010-05-18 22:15:13 -03:00
views Merge remote branch 'origin/1.3' into 2.0 2010-05-20 12:22:04 +10: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 Update various links. Closes #392 2010-05-18 22:15:13 -03:00
test_plugin_app_model.php Update various links. Closes #392 2010-05-18 22:15:13 -03:00