mark_story a275555297 Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Model/Datasource/CakeSession.php		2012-01-29 15:38:56 -05:00
..
Behavior	Split I18nModel into a separate file.	2012-01-29 13:28:08 -05:00
Datasource	Merge branch '2.0' into 2.1	2012-01-29 15:38:56 -05:00
AclNode.php	fix correct node lookup when authorize object uses plugin userModel setting, fixes #2464	2012-01-27 00:16:22 +01:00
Aco.php	Fix missing App::uses() added	2011-12-14 08:08:35 -05:00
AcoAction.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
Aro.php	Fix missing App::uses() added	2011-12-14 08:08:35 -05:00
BehaviorCollection.php	Merge branch '2.0' into 2.1	2012-01-08 21:59:18 -05:00
CakeSchema.php	Merge branch '2.0' into 2.1	2011-12-11 22:51:40 -05:00
ConnectionManager.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00
I18nModel.php	Split I18nModel into a separate file.	2012-01-29 13:28:08 -05:00
Model.php	Merge branch '2.0' into 2.1	2012-01-26 21:40:18 +01:00
ModelBehavior.php	fixing typos	2011-10-19 12:19:28 +07:00
Permission.php	Add/move docblocks to make text available in the API docs	2011-12-08 07:35:02 -08:00