cakephp2-php8/cake
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
..
libs/view/errors Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
tests Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
LICENSE.txt Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
VERSION.txt Updating version numbers for 2.0.0-dev 2010-12-26 20:16:48 -05:00