Mark Story adf604a966 Merge branch '1.3' into 2.0 ... Conflicts: cake/console/templates/default/actions/controller_actions.ctp cake/console/templates/default/views/form.ctp cake/console/templates/default/views/index.ctp cake/console/templates/default/views/view.ctp cake/libs/controller/controller.php cake/libs/controller/scaffold.php cake/libs/view/pages/home.ctp cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/model/cake_schema.test.php		2010-05-02 17:53:42 -04:00
..
helpers	Merge branch '1.3' into 2.0	2010-05-02 17:53:42 -04:00
helper.test.php	Merge remote branch 'origin/1.3' into 2.0	2010-04-09 22:05:00 +10:00
media.test.php	Trimming trailing whitespace.	2010-04-17 13:05:26 -04:00
theme.test.php	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
view.test.php	Fixing fatal errors in View test.	2010-04-24 00:22:21 -04:00