mark_story 4c98e39c1f Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Controller/Component/SecurityComponent.php		2012-12-29 11:44:59 -05:00
..
Component	Merge branch 'master' into 2.3	2012-12-29 11:44:59 -05:00
ComponentCollectionTest.php	unify object load/unload and loaded methods	2012-11-16 12:14:28 +01:00
ComponentTest.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
ControllerMergeVarsTest.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
ControllerTest.php	Code cleanup	2012-12-28 23:37:58 +01:00
PagesControllerTest.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
ScaffoldTest.php	Fix missing plugin parameters in scaffolding.	2012-11-27 21:59:06 -05:00