]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorJoe Watkins <krakjoe@php.net>
Wed, 29 May 2019 06:30:41 +0000 (08:30 +0200)
committerJoe Watkins <krakjoe@php.net>
Wed, 29 May 2019 06:30:41 +0000 (08:30 +0200)
* PHP-7.2:
  disabled functions must not have return type

1  2 
Zend/zend_API.c

diff --cc Zend/zend_API.c
Simple merge