chinpei215 31a1837c1d Merge branch '2.x' into 2.next ... Conflicts: lib/Cake/Test/Case/View/Helper/FlashHelperTest.php lib/Cake/VERSION.txt lib/Cake/View/Helper/FlashHelper.php		2017-03-25 17:12:28 +09:00
..
Elements	Don't use short tags.	2015-08-20 22:36:09 -04:00
Errors	Re-add closing tags to ctp files	2015-09-25 18:10:18 +02:00
Helper	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
Scaffolds	Various improvments to the CakePH Plib files	2015-09-25 17:11:20 +02:00
Helper.php	Merge branch '2.x' into 2.next	2016-09-04 23:54:22 -04:00
HelperCollection.php	Replace our custom code fence with markdown standard fence	2015-01-09 13:47:25 +01:00
JsonView.php	Backport jsonOptions	2015-04-30 15:51:13 +02:00
MediaView.php	Fix MediaView extension handling as documented and expected.	2015-08-21 12:35:49 +02:00
ScaffoldView.php	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00
ThemeView.php	Update all @deprecated annotations	2014-09-02 17:03:22 +02:00
View.php	Fix errors in php7.1	2016-12-05 16:14:33 -05:00
ViewBlock.php	Merge pull request #5760 from cakephp/master	2015-01-27 20:48:15 -05:00
XmlView.php	Back port fixes from #7899 to 2.x	2016-01-03 22:08:09 -05:00