]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorRemi Collet <remi@php.net>
Wed, 26 Apr 2017 12:41:54 +0000 (14:41 +0200)
committerRemi Collet <remi@php.net>
Wed, 26 Apr 2017 12:41:54 +0000 (14:41 +0200)
* PHP-7.0:
  rely on bundle config, instead of system one


Trivial merge