Merge branch 'PHP-7.4'

author Joe Watkins <krakjoe@php.net>

Wed, 3 Jul 2019 06:16:47 +0000 (08:16 +0200)

committer Joe Watkins <krakjoe@php.net>

Wed, 3 Jul 2019 06:16:47 +0000 (08:16 +0200)
author Joe Watkins <krakjoe@php.net>
Wed, 3 Jul 2019 06:16:47 +0000 (08:16 +0200)
committer Joe Watkins <krakjoe@php.net>
Wed, 3 Jul 2019 06:16:47 +0000 (08:16 +0200)
diff --cc azure/i386/job.yml
Simple merge
diff --cc azure/job.yml
Simple merge
diff --cc azure/macos/job.yml
Simple merge
diff --cc travis/compile.sh
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Wed, 3 Jul 2019 06:16:47 +0000 (08:16 +0200)
committer	Joe Watkins <krakjoe@php.net>
	Wed, 3 Jul 2019 06:16:47 +0000 (08:16 +0200)
		1	2
azure/i386/job.yml	patch \|	diff1 \|	diff2 \|	blob \| history
azure/job.yml	patch \|	diff1 \|	diff2 \|	blob \| history
azure/macos/job.yml	patch \|	diff1 \|	diff2 \|	blob \| history
travis/compile.sh	patch \|	diff1 \|	diff2 \|	blob \| history