mark_story 8cadb553d7 Merge branch 'master' into 2.7		2015-03-14 22:08:53 -04:00
..
Component	Merge branch 'master' into 2.7	2015-03-09 21:55:20 -04: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	Fix class name in scaffold error.	2015-03-12 22:00:03 -04:00