mark_story 87924414fc Update Configure::load() to use Set::merge() ... This fixes some of the awkward behavior that using array_merge_recursive() could create. Fixes #2441		2012-01-07 10:45:48 -05:00
..
App.php	Fix types in docblocks in App class	2011-12-31 14:51:24 -08:00
CakePlugin.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
Configure.php	Update Configure::load() to use Set::merge()	2012-01-07 10:45:48 -05:00
Object.php	Fix bare require() to use App::uses()	2011-12-06 20:09:05 -05:00