cakephp2-php8/lib/Cake/Routing
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
..
Route Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-09 12:58:49 -04:30
Dispatcher.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-03-10 23:17:54 -04:30
Router.php Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-04-11 22:48:08 -04:30