]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorRemi Collet <remi@php.net>
Mon, 20 Nov 2017 07:50:51 +0000 (08:50 +0100)
committerRemi Collet <remi@php.net>
Mon, 20 Nov 2017 07:50:51 +0000 (08:50 +0100)
* PHP-7.0:
  NEWS
  fix bug #75540 Segfault with libzip 1.3.1

1  2 
ext/zip/php_zip.c

Simple merge