]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)
committerAnatol Belski <ab@php.net>
Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)
* PHP-7.0:
  It looks like i should've taken joint response on ext/fileinfo long ago

1  2 
ext/standard/credits_ext.h

Simple merge