]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 15:58:09 +0000 (15:58 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 15:58:09 +0000 (15:58 +0000)
* PHP-7.0:
  fix stub to accept user properly


Trivial merge