]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorRemi Collet <remi@php.net>
Sun, 19 Feb 2017 16:02:16 +0000 (17:02 +0100)
committerRemi Collet <remi@php.net>
Sun, 19 Feb 2017 16:02:16 +0000 (17:02 +0100)
* PHP-7.0:
  fix test for libzip 1.2.0


Trivial merge