cakephp2-php8/lib/Cake/Console/templates/skel/Config
Jose Lorenzo Rodriguez 91bce16e9d Merge remote-tracking branch 'origin/2.0' into 2.0-merge
Conflicts:
	lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
	lib/Cake/tests/Case/Log/Engine/FileLog.php
	lib/Cake/tests/Case/Log/Engine/FileLogTest.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
..
schema Renaming more folders 2011-05-13 02:31:33 -04:30
acl.ini.php Renaming more folders 2011-05-13 02:31:33 -04:30
bootstrap.php Renaming more folders 2011-05-13 02:31:33 -04:30
core.php Merge remote-tracking branch 'origin/2.0' into 2.0-merge 2011-05-15 00:40:54 -04:30
database.php.default Renaming more folders 2011-05-13 02:31:33 -04:30
email.php.default Renaming more folders 2011-05-13 02:31:33 -04:30
routes.php Renaming more folders 2011-05-13 02:31:33 -04:30