]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sun, 23 Apr 2017 19:34:31 +0000 (21:34 +0200)
committerAnatol Belski <ab@php.net>
Sun, 23 Apr 2017 19:34:31 +0000 (21:34 +0200)
* PHP-7.0:
  extend zlib export required for the recent libpng


Trivial merge