]> granicus.if.org Git - php/commit
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)
commit9e3672eaef233c24b1b846971abed19ea8e96f52
tree8ab2c82e5172ae8e556d75d88cea6f2b7054a499
parent2b7c3831cdc9a0e708040af37d8cf8967755bce3
parentbc2b500d3e35de1a0916a122f9dab306286d1d77
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  explicitly ignore php.ini for proc open tests