cakephp2-php8/lib/Cake/tests/test_app
José Lorenzo Rodríguez d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
..
config Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
console Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
controllers Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
libs Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
locale Moving the tests folder 2010-12-08 01:36:38 -04:30
models Fixes for making mpass all ConnectionManager Tests 2011-01-06 00:09:11 -04:30
plugins Fixing App::objects() so it will accept again the plugin syntax fro retreiving plugin objects 2011-01-08 23:44:24 -04:30
tmp Moving the tests folder 2010-12-08 01:36:38 -04:30
vendors Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
views Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
webroot/theme/test_theme Moving the tests folder 2010-12-08 01:36:38 -04:30