]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 23 Jun 2017 06:51:46 +0000 (07:51 +0100)
committerJoe Watkins <krakjoe@php.net>
Fri, 23 Jun 2017 06:51:46 +0000 (07:51 +0100)
* PHP-7.0:
  Remove superfluous branch

1  2 
Zend/zend_hash.c

Simple merge