]> granicus.if.org Git - php/commit
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)
commit2992f4164dad208fb539d18264a851a3af83dfe8
tree5a21110927adc6988e3051e74fea37f2472c81aa
parent71fe529afc2f9bfd99d85539c709a27f025c0caa
parentef7e5e0d69975bc340635b37eb2355a1e9b882b9
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix stub to accept user properly