]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Wed, 29 May 2019 06:32:06 +0000 (08:32 +0200)
committerJoe Watkins <krakjoe@php.net>
Wed, 29 May 2019 06:32:06 +0000 (08:32 +0200)
* PHP-7.4:
  disabled functions must not have return type
  Restore the execute bit for run-tests.php

1  2 
Zend/zend_API.c

diff --cc Zend/zend_API.c
Simple merge