Commit graph

2 commits

Author SHA1 Message Date
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
Jose Lorenzo Rodriguez
0263ffc74e Renaming tests folders and making tests runnable again 2011-04-10 20:08:24 -04:30
Renamed from lib/Cake/tests/cases/Model/ModelIntegrationTest.php (Browse further)