mark_story 4118477c0a Merge branch '1.3' into merger ... Conflicts: cake/console/templates/default/views/index.ctp cake/libs/cache.php cake/libs/cake_log.php cake/libs/cake_socket.php cake/libs/view/helpers/form.php cake/libs/view/helpers/js.php cake/tests/cases/libs/view/helpers/js.test.php cake/tests/lib/reporter/cake_cli_reporter.php		2011-03-19 09:08:28 -04:00
..
cases	Merge branch '1.3' into merger	2011-03-19 09:08:28 -04:00
fixtures	Merge branch '1.3' into merger	2011-02-05 12:20:09 -05:00
lib	Fixing failing tests, and issues around Controller::$view not getting	2011-03-09 07:31:11 -05:00
test_app	Fixing incorrect test case. Thanks to hiromi2424 for pointing out the mistake.	2011-03-14 21:13:24 -04:00