cakephp2-php8/lib/Cake/tests
AD7six 39c7d03319 Merge branch '2.0-class-loading' into 2.0-translations
Conflicts:
	lib/Cake/Console/Command/Task/ControllerTask.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Core/Configure.php
	lib/Cake/View/pages/home.ctp
2011-03-16 12:29:39 +01:00
..
cases Merge branch '2.0-class-loading' into 2.0-translations 2011-03-16 12:29:39 +01:00
fixtures Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
test_app Merge branch '2.0-class-loading' into 2.0-translations 2011-03-16 12:29:39 +01:00