mark_story 87fcc9f0b9 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-10-13 21:11:38 -04:00
..
Behavior	Merge branch 'master' into 2.6	2014-07-03 11:13:06 -04:00
Datasource	Merge branch 'master' into 2.6	2014-10-13 21:11:38 -04:00
Validator	Merge branch 'master' into 2.6	2014-07-03 11:13:06 -04:00
AclNode.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02: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	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00
CakeSchema.php	All CakeSchema doc blocks conform to coding standards.	2014-08-12 12:55:55 -05:00
ConnectionManager.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02: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.6	2014-10-13 21:11:38 -04:00
ModelBehavior.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ModelValidator.php	Merge branch 'master' into 2.6	2014-07-03 11:13:06 -04:00
Permission.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00