Mark Story 09ad7418f5 Merge remote branch 'origin/1.2' into merger ... Conflicts: cake/console/templates/skel/config/inflections.php cake/libs/model/cake_schema.php cake/libs/model/model.php		2010-01-15 11:51:58 -05:00
..
console	Test cases for model bake updates, refs #147	2010-01-01 20:19:15 +11:00
libs	Merge remote branch 'origin/1.2' into merger	2010-01-15 11:51:58 -05:00
basics.test.php	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
dispatcher.test.php	Updating Controllers used to test full page caching to reflect changes in CacheHelper's functionality.	2010-01-03 23:51:31 -05:00