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

1  2 
ext/standard/credits_ext.h

Simple merge