mark_story 27d7e2865e Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Console/Command/ConsoleShell.php lib/Cake/Network/CakeSocket.php lib/Cake/Network/Http/HttpResponse.php lib/Cake/Utility/Folder.php lib/Cake/View/MediaView.php lib/Cake/basics.php		2012-11-20 23:02:33 -05:00
..
Behavior	Merge branch 'master' into 2.3	2012-11-20 23:02:33 -05:00
Datasource	Merge branch 'master' into 2.3	2012-11-20 23:02:33 -05:00
Validator	Merge branch 'master' into 2.3	2012-11-14 21:50:29 -05: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	Remove all todo from core, create tickets for them	2012-11-14 14:59:51 +01:00
CakeSchema.php	coding standards regarding whitespaces	2012-10-27 00:46:12 +02:00
ConnectionManager.php	Remove trailing whitespace from comments	2012-10-15 18:19:37 -06:00
I18nModel.php	missing app uses statements	2012-07-21 13:34:33 +02:00
Model.php	Merge branch 'master' into 2.3	2012-11-10 21:33:26 -05:00
ModelBehavior.php	Adding missing afterValidate callback to behaviors, Fixes #3024	2012-07-10 20:35:26 -04:30
ModelValidator.php	Ensuring list of behavior methods are refreshed between calls of	2012-08-25 14:05:19 +02:00
Permission.php	fix coding standards, remove break after return/continue	2012-11-15 12:09:14 +01:00