]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 21 Mar 2017 11:44:36 +0000 (12:44 +0100)
committerAnatol Belski <ab@php.net>
Tue, 21 Mar 2017 11:44:36 +0000 (12:44 +0100)
* PHP-7.0:
  explicitly ignore php.ini for proc open tests


Trivial merge