cakephp2-php8/lib/Cake/tests/cases/libs/controller
José Lorenzo Rodríguez 22581516db Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	lib/Cake/tests/cases/libs/controller/component.test.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
	lib/Cake/tests/cases/libs/controller/pages_controller.test.php
2010-12-18 00:04:44 -04:30
..
components Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-18 00:04:44 -04:30
component.test.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-18 00:04:44 -04:30
component_collection.test.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
controller.test.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-18 00:04:44 -04:30
controller_merge_vars.test.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-18 00:04:44 -04:30
pages_controller.test.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-18 00:04:44 -04:30
scaffold.test.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30