mark_story 4d6611b328 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-12-17 21:38:32 -05:00
..
Component	Merge branch 'master' into 2.6	2014-12-17 21:38:32 -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	remove undocumented code and uncessary in_array() checks + cleanup	2013-08-08 03:56:58 +02:00
Controller.php	Add @trigger doc blocks of methods triggering CakeEvent	2014-11-30 14:45:40 -07:00
Scaffold.php	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00