]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorRemi Collet <remi@php.net>
Mon, 9 Sep 2019 12:22:24 +0000 (14:22 +0200)
committerRemi Collet <remi@php.net>
Mon, 9 Sep 2019 12:22:24 +0000 (14:22 +0200)
* PHP-7.4:
  zip edxtension is now 1.15.5
  fix type consistency after 8f897f1040f00210f4a5cdd82a88a1fe3e558955

1  2 
ext/zip/php_zip.c

Simple merge