Mark Story 4ac0a55aff Merge branch 'virtual-fields' into 1.3-misc ... Conflicts: cake/tests/cases/libs/controller/controller.test.php		2009-12-19 19:40:12 -05:00
..
console	Merge branch '1.3' into 1.3-misc	2009-12-10 23:42:55 -05:00
libs	Merge branch 'virtual-fields' into 1.3-misc	2009-12-19 19:40:12 -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	Fixing issue where _restructureParams would move controller key to the plugin key causing issues switching controllers. Tests added. Fixes #115	2009-12-17 10:16:47 -05:00