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
..
config	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
controllers	Merge branch '1.3' into 1.3-newlines	2009-07-25 10:41:40 -07:00
locale	fixes #6455, i18n locale message category bug	2009-07-03 15:54:26 +00:00
models	Moving test plugin datasource to the correct location.	2009-09-24 19:37:07 -04:00
plugins	Enabling plugin.name schema file creation and addition.	2009-10-04 13:32:33 -04:00
tmp	updating file engine and test case	2008-06-24 01:09:54 +00:00
vendors	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
views	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00