cakephp2-php8/cake/tests/cases/libs/controller
Mark Story 6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/libs/tasks/model.php
	cake/dispatcher.php
	cake/libs/l10n.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
..
components Merge remote branch 'origin/1.2' into 1.2-merger 2010-02-20 01:32:04 -05:00
component.test.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
controller.test.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
controller_merge_vars.test.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
pages_controller.test.php Merge branch '1.2' into 1.3-merger 2010-01-26 17:54:34 -05:00
scaffold.test.php Refactoring extensions in ScaffoldView to reflect removal of magic .thtml extension. 2010-01-28 11:11:19 -05:00