]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorRemi Collet <remi@php.net>
Wed, 3 Jan 2018 14:13:10 +0000 (15:13 +0100)
committerRemi Collet <remi@php.net>
Wed, 3 Jan 2018 14:13:10 +0000 (15:13 +0100)
* PHP-7.1:
  2018


Trivial merge