Mark Story 6b2154d961 Merge branch '1.2' into mergers ... Conflicts: cake/libs/inflector.php cake/tests/cases/libs/model/model_validation.test.php		2009-12-27 12:34:27 -05:00
..
config	Merge branch '1.2' into 1.3-merger	2009-11-22 20:38:50 -05:00
controllers	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
libs	Adding file headers.	2009-11-14 20:25:45 -05:00
locale	fixes #6455, i18n locale message category bug	2009-07-03 15:54:26 +00:00
models	Updating more Copyright dates.	2009-11-06 18:04:38 +11:00
plugins	Adding file missed in previous commit.	2009-12-16 22:16:59 -05:00
tmp	updating file engine and test case	2008-06-24 01:09:54 +00:00
vendors	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
views	Merge branch '1.2' into mergers	2009-12-27 12:34:27 -05:00
webroot/theme/test_theme	Adding more tests for theme assets	2009-11-27 10:27:15 -06:00