cakephp2-php8/lib/Cake/Model
mark_story 2c5d96e916 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
..
Behavior Fix temporary associations that replace fields not being restored. 2014-02-11 21:56:05 -05:00
Datasource Merge branch 'master' into 2.5 2014-02-16 14:24:19 -05:00
Validator Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01: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 Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01:00
CakeSchema.php Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01: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-01-26 17:39:50 +05:30
ModelBehavior.php Removed "PHP 5" from file header DocBlocks 2013-11-13 22:58:39 +01:00
ModelValidator.php Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Permission.php Merge branch 'master' into 2.5 2014-02-11 18:17:59 +05:30