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	Merge branch '1.2' into 1.2-merger	2009-09-16 01:23:49 -04:00
console	Merge branch '1.3-console' into 1.3	2009-10-11 21:51:02 -04:00
libs	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
tests	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
basics.php	Merge branch '1.3-bake' into 1.3	2009-09-20 17:42:43 -04:00
bootstrap.php	Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit.	2009-09-07 15:12:39 -04:00
dispatcher.php	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
LICENSE.txt	closes #5271, removing root docs directory. adding README	2008-12-25 18:05:56 +00:00
VERSION.txt	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00