cakephp2-php8/lib/Cake/Console/templates/skel/config
Jose Lorenzo Rodriguez 000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
..
schema Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
acl.ini.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
bootstrap.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
core.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-12 23:49:02 -04:30
database.php.default Changing paths againg form datasources sub packages, 2011-03-16 00:14:37 -04:00
routes.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30