Mark Story 35e0dc2bbd Merge pull request #5760 from cakephp/master ... Merge master into 2.7		2015-01-27 20:48:15 -05:00
..
Component	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
CakeErrorController.php	More API docblock fixes.	2014-06-01 03:06:05 +05:30
Component.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ComponentCollection.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
Controller.php	Remove conditional status setting.	2015-01-26 23:47:20 +01:00
Scaffold.php	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00