]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 23 Jul 2016 11:29:57 +0000 (13:29 +0200)
committerNikita Popov <nikic@php.net>
Sat, 23 Jul 2016 11:29:57 +0000 (13:29 +0200)
commitf12fd5c2d323ad4f76bea50fc2adecc3db0cae59
tree194278d7e63299889f448104ad11c1644ab2d326
parent7d772897177eea2889be81d0f1b9a190b66a5c18
parent65abdb556ddf67068951020b8829c0817697a84e
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/standard/ftp_fopen_wrapper.c
NEWS
ext/standard/ftp_fopen_wrapper.c