]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 1 Jul 2017 18:06:39 +0000 (20:06 +0200)
committerAnatol Belski <ab@php.net>
Sat, 1 Jul 2017 18:06:39 +0000 (20:06 +0200)
* PHP-7.0:
  yet one C++ compat fix

1  2 
Zend/zend_object_handlers.h

Simple merge