]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 13 Aug 2016 19:41:00 +0000 (21:41 +0200)
committerNikita Popov <nikic@php.net>
Sat, 13 Aug 2016 19:41:00 +0000 (21:41 +0200)
commit98787d90020c7b21c1dd5d1701e6157993d02aec
tree3bff54d853092256b239d055385184817bd60400
parent33508a3d4730f8d15d37e2e5c4c2b18a545fd989
parentdfadc5a427b548cab2b7c037c05f65684e08a248
Merge branch 'PHP-5.6' into PHP-7.0
NEWS
ext/ftp/ftp.c