mark_story 2e4d6eb009 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/VERSION.txt		2014-05-16 21:26:30 -04:00
..
Behavior	Added $type as an argument.	2014-05-12 12:08:06 +02:00
Datasource	Unset $db in DboSource::read().	2014-05-13 21:17:34 +09:00
Validator	Add a note to offsetSet() on why it cannot chain.	2014-04-06 22:59:18 +02:00
AclNode.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
Aco.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
AcoAction.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
Aro.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
BehaviorCollection.php	More coding standard corrections.	2014-04-29 14:19:33 +02:00
CakeSchema.php	More coding standard corrections.	2014-04-29 14:19:33 +02:00
ConnectionManager.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +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.5	2014-05-12 14:30:02 -04:00
ModelBehavior.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
ModelValidator.php	microptimize options and default merge and other string key array merges	2014-04-08 01:25:14 +02:00
Permission.php	Merge branch 'master' into 2.5	2014-02-11 18:17:59 +05:30