mark_story d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in ... Conflicts: cake/console/libs/shell.php cake/libs/model/connection_manager.php cake/libs/view/helpers/html.php cake/libs/view/helpers/javascript.php cake/tests/cases/libs/i18n.test.php cake/tests/cases/libs/model/connection_manager.test.php cake/tests/cases/libs/model/model_read.test.php cake/tests/cases/libs/view/helpers/html.test.php cake/tests/groups/database.group.php		2009-10-14 00:51:55 -04:00
..
helpers	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
helper.test.php	Adding Helper::assetTimestamp()	2009-09-23 23:45:11 -04:00
theme.test.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
view.test.php	Removing magic 'title' key in Controller::set() and View::set()	2009-09-28 21:23:40 -04:00