mark_story ac9a212d44 Merge branch 'master' into 2.7 ... Conflicts: lib/Cake/Utility/String.php		2015-01-11 15:25:18 -05:00
..
CacheHelperTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
FormHelperTest.php	Fix PHPCS error.	2015-01-09 15:32:33 -05:00
HtmlHelperTest.php	Add test for css() and script() with the same resource identifier	2014-11-19 11:20:37 +07:00
JqueryEngineHelperTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
JsHelperTest.php	Fix verification of expected invocations #2919	2014-03-01 19:06:17 +01:00
MootoolsEngineHelperTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
NumberHelperTest.php	more missing doc block tags added	2014-04-02 03:02:37 +02:00
PaginatorHelperTest.php	Fix tests	2014-12-09 03:43:35 +01:00
PrototypeEngineHelperTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
RssHelperTest.php	Merge branch 'master' into 2.5	2013-11-25 23:15:15 -05:00
SessionHelperTest.php	Removed "PHP 5" from file header DocBlocks	2013-11-13 22:58:39 +01:00
TextHelperTest.php	More String CakeText replacements and a BC class.	2015-01-05 00:55:23 +01:00
TimeHelperTest.php	fixes failing test cases from last CakeTime::timeAgoInWords changes	2014-10-01 11:09:00 +02:00