mark_story ac9a212d44 Merge branch 'master' into 2.7 ... Conflicts: lib/Cake/Utility/String.php		2015-01-11 15:25:18 -05:00
..
Behavior	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
Datasource	Merge pull request #5576 from istvanp/2.7	2015-01-06 21:23:53 -05:00
Validator	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
AclNode.php	Consolidate with conditions sniff.	2014-12-09 03:17:35 +01:00
Aco.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
AcoAction.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
Aro.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
BehaviorCollection.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
CakeSchema.php	Now the tableParameters array gets escaped through values(), too	2014-10-16 19:10:52 +02:00
ConnectionManager.php	Correct doc block return types.	2014-11-05 13:03:27 +01:00
I18nModel.php	Improved the DocBlocks and other code cleanup	2013-05-31 00:11:19 +02:00
Model.php	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
ModelBehavior.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
ModelValidator.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
Permission.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00