mark_story 3078a1eb52 Merge branch 'master' into 2.7 ... Conflicts: lib/Cake/VERSION.txt		2015-01-16 22:22:26 -05:00
..
CacheHelper.php	Merge branch 'master' into 2.6	2014-08-08 23:28:06 -04:00
FormHelper.php	Merge pull request #5616 from cakephp/issue-5603	2015-01-09 15:32:44 -05:00
HtmlHelper.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
JqueryEngineHelper.php	Update doc blocks regarding return $this	2014-06-25 00:06:51 +02:00
JsBaseEngineHelper.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
JsHelper.php	Take care of more int casts.	2014-09-10 16:29:23 +02:00
MootoolsEngineHelper.php	a / an typo fixes fot API	2014-07-30 22:11:03 +02:00
NumberHelper.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
PaginatorHelper.php	Fix notice in PaginatorHelper when model params are not available.	2015-01-16 14:11:32 +01:00
PrototypeEngineHelper.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
RssHelper.php	Correct doc blocks according to cs guidelines.	2014-07-03 15:36:42 +02:00
SessionHelper.php	Merge branch 'master' into 2.7	2015-01-11 15:25:18 -05:00
TextHelper.php	App::uses and usage replacements for String => CakeText.	2015-01-05 01:00:57 +01:00
TimeHelper.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00