cakephp2-php8/cake/tests/cases/libs/controller
Mark Story 6c3c5e9012 Merge remote branch 'rchavik/ticket_293' into 1.3
Conflicts:
	cake/libs/controller/components/email.php
2010-02-07 16:26:37 -05:00
..
components Merge remote branch 'rchavik/ticket_293' into 1.3 2010-02-07 16:26:37 -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