mark_story 051d78c1a5 Merge branch 'master' into 2.6 ... Conflicts: lib/Cake/Model/Model.php		2014-07-16 23:11:58 -04:00
..
bake_compare/Controller	Updated bake templates to use CakeRequest::allowMethod()	2014-02-10 17:56:57 +05:30
Case	Merge branch 'master' into 2.6	2014-07-16 23:11:58 -04:00
Fixture	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
test_app	Merge branch 'master' into 2.6	2014-07-09 10:17:05 -04:00