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
..
Email	Merge branch '2.x' into 2.next	2017-03-25 17:12:28 +09:00
Http	Fix HttpSocket emitting errors when nameless cookies are encountered.	2016-11-03 19:07:25 -04:00
CakeRequest.php	Fix invalid return value hint	2017-02-08 13:48:22 +01:00
CakeResponse.php	PHPDoc fixes	2017-02-17 16:59:35 +01:00
CakeSocket.php	Refactor Object to CakeObject for future PHP7 comp.	2016-04-08 14:33:26 +02:00