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
..
form.ctp	Merge branch '1.3' into merger	2011-03-19 09:08:28 -04:00
home.ctp	Fixing fatal error caused by Debugger not being loaded when viewing the default home page.	2010-12-27 00:07:47 -05:00
index.ctp	removing extra space in default bake template	2011-03-16 13:50:56 +07:00
view.ctp	Removing @subpackage tags, moving contents of @subpackage into @package.	2010-12-24 14:09:57 -05:00