]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 10 Apr 2017 07:06:11 +0000 (08:06 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 10 Apr 2017 07:06:11 +0000 (08:06 +0100)
commitc961beb5de556dc18ea167e17857a41827876564
treec13f541687124407f8acbaaf13f7e577b23c65cc
parent1b6f784dd6cbcc8c8f93a0c647948dedf09ad070
parent60b68f19f0618c884b9d97da79bd0b5c06c35072
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74400 (phpdbg comparing socket function to int)