granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 37d01ff cc598d1)

author	Joe Watkins <krakjoe@php.net>
	Wed, 29 May 2019 06:32:06 +0000 (08:32 +0200)
committer	Joe Watkins <krakjoe@php.net>
	Wed, 29 May 2019 06:32:06 +0000 (08:32 +0200)
commit	9f94566ff8fb912d919820b10650d14e05e1cce4
tree	0ee6e0e96428e1d5a9dfaf9f19a0b2a5226382ef	tree \| snapshot
parent	37d01ff81a6b34677837f241e5a9ea393983e24c	commit \| diff
parent	cc598d1ea93b3accde1ad29e867834ad1485157c	commit \| diff

Merge branch 'PHP-7.4'

* PHP-7.4:
disabled functions must not have return type
Restore the execute bit for run-tests.php

Zend/zend_API.c

Unnamed repository; edit this file 'description' to name the repository.