mark_story 2afb05b590 Merge branch '2.0' into 2.1 ... Conflicts: app/View/Pages/home.ctp lib/Cake/Config/config.php lib/Cake/Core/App.php lib/Cake/VERSION.txt lib/Cake/View/Helper/NumberHelper.php		2012-02-12 10:06:13 -05:00
..
App.php	Merge branch '2.0' into 2.1	2012-02-12 10:06:13 -05:00
CakePlugin.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
Configure.php	Splitting ConfigReaderInterface out into a separate file.	2012-01-29 13:30:05 -05:00
Object.php	Fix bare require() to use App::uses()	2011-12-06 20:09:05 -05:00