]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 29 May 2017 07:29:58 +0000 (08:29 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 29 May 2017 07:29:58 +0000 (08:29 +0100)
* PHP-7.0:
  Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection


Trivial merge