mark_story 4b8c469004 Merge branch '2.1' into 2.2 ... Conflicts: lib/Cake/VERSION.txt		2012-05-26 21:11:36 -04:00
..
Behavior	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Datasource	Merge branch '2.1' into 2.2	2012-05-26 21:11:36 -04:00
Validator	Fix array arguments being translated.	2012-05-23 21:02:41 -04:00
AclNode.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Aco.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
AcoAction.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
Aro.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
BehaviorCollection.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
CakeSchema.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
ConnectionManager.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
I18nModel.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
Model.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
ModelBehavior.php	Updated copyright to 2012.	2012-03-12 22:46:46 -04:00
ModelValidator.php	Improving ModelValidator::add() to allow multiple rules to be defined at once	2012-05-20 18:51:00 -04:30
Permission.php	Merge branch '2.2-hash' into 2.2	2012-04-10 21:32:37 -04:00