cakephp2-php8/lib/Cake
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
..
Cache Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
config Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
Configure consolidate cake_error and cake_developer to simply "cake_dev" 2011-03-20 16:38:31 +01:00
Console Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
Controller Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
Core Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
Error Fixing test loading in cli 2011-04-11 22:23:03 -04:30
I18n Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-01 23:04:52 -04:30
Log consolidate cake_error and cake_developer to simply "cake_dev" 2011-03-20 16:38:31 +01:00
Model Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
Network Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
Routing Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
tests Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
TestSuite Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
Utility Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
View Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30
basics.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-02-27 22:50:53 -04:30
bootstrap.php Fixing some bake tasks 2011-04-11 22:15:51 -04:30
LICENSE.txt move readme and license to libs dimove readme and license to libs dirr 2011-03-12 20:10:58 +01:00
VERSION.txt move readme and license to libs dimove readme and license to libs dirr 2011-03-12 20:10:58 +01:00