mark_story ac9a212d44 Merge branch 'master' into 2.7 ... Conflicts: lib/Cake/Utility/String.php		2015-01-11 15:25:18 -05: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.7	2015-01-11 15:25:18 -05:00
Fixture	Removed use of @lastmodified annotation	2014-09-09 23:04:29 +02:00
test_app	Fix Extract task to correctly extract messages with context	2014-12-25 14:28:44 +02:00