cakephp2-php8/cake/tests/cases/libs/controller
mark_story 326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
..
components Updating session component, to not use layout, and use elements instead. 2009-08-31 23:59:40 -04:00
component.test.php updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
controller.test.php updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
controller_merge_vars.test.php adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
pages_controller.test.php updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
scaffold.test.php Merge branch '1.2' into 1.2-merger 2009-09-13 13:52:58 -04:00