]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Sat, 23 Jul 2016 11:30:16 +0000 (13:30 +0200)
committerNikita Popov <nikic@php.net>
Sat, 23 Jul 2016 11:30:55 +0000 (13:30 +0200)
commit696d6e7c907f6e6ba4efb3f4db951eb9eb5b60de
tree4e27a2f56d4e44dba1cd4a36ffd2082cb10cb59f
parentf4d1af7981a4173b25e9ef84fcc550b8b0df72c0
parentf12fd5c2d323ad4f76bea50fc2adecc3db0cae59
Merge branch 'PHP-7.0' into PHP-7.1
NEWS
ext/standard/ftp_fopen_wrapper.c