mark_story 051d78c1a5 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Model/Model.php		2014-07-16 23:11:58 -04:00
..
Behavior	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
Datasource	Fix CS	2014-07-14 01:21:09 +09:00
Validator	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
AclNodeTest.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
BehaviorCollectionTest.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
CakeSchemaTest.php	Merge branch 'master' into 2.5	2013-11-19 00:27:12 +05:30
ConnectionManagerTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
ModelCrossSchemaHabtmTest.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ModelDeleteTest.php	Fix verification of expected invocations #2919	2014-03-01 19:06:17 +01:00
ModelIntegrationTest.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ModelReadTest.php	Merge branch 'master' into 2.5	2014-04-06 21:50:41 +02:00
models.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ModelTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
ModelTestBase.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
ModelValidationTest.php	replaces validator 'between' with 'lengthBetween'	2014-05-13 10:46:25 +02:00
ModelWriteTest.php	Merge branch 'master' into 2.6	2014-07-16 23:11:58 -04:00