cakephp2-php8/cake/tests/test_app/plugins/test_plugin/vendors
mark_story 326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
..
css Moving Cake folder to correct location 2008-05-30 11:40:08 +00:00
img closes #4903, closes #4669 allows serving images from vendors and plugin vendors 2008-06-17 04:24:55 +00:00
js/test_plugin Fixing building of the right vendor path in the dispatcher in the case the plugin name appears again in the path 2009-08-12 16:08:31 +02:00
sample adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
shells adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
welcome.php adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00