mark_story 7ef83b89f5 Merge branch '2.1' into 2.2 ... h origin especially if it merges an updated upstream into a topic branch.		2012-06-17 20:54:59 -04:00
..
Component	Merge branch '2.1' into 2.2	2012-06-17 20:54:59 -04:00
CakeErrorController.php	Fixing call to deprecated method, using startupProcess() which will initialize components.	2012-04-13 15:57:06 +02:00
Component.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
ComponentCollection.php	Show plugin name in error message if a plugin component was requested	2012-03-24 00:22:50 +05:30
Controller.php	Remove duplicate code.	2012-06-06 21:01:16 -04:00
Scaffold.php	Fix scaffold delete messages with uuids.	2012-04-24 20:11:58 -04:00