Merge branch 'PHP-7.4'

author Nikita Popov <nikita.ppv@gmail.com>

Mon, 24 Feb 2020 11:41:49 +0000 (12:41 +0100)

committer Nikita Popov <nikita.ppv@gmail.com>

Mon, 24 Feb 2020 11:41:49 +0000 (12:41 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 24 Feb 2020 11:41:49 +0000 (12:41 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 24 Feb 2020 11:41:49 +0000 (12:41 +0100)
diff --cc .travis.yml
Simple merge
diff --cc azure/i386/job.yml
Simple merge
diff --cc azure/macos/job.yml
Simple merge
diff --cc travis/compile.sh
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 24 Feb 2020 11:41:49 +0000 (12:41 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 24 Feb 2020 11:41:49 +0000 (12:41 +0100)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
azure/i386/job.yml	patch \|	diff1 \|	diff2 \|	blob \| history
azure/macos/job.yml	patch \|	diff1 \|	diff2 \|	blob \| history
travis/compile.sh	patch \|	diff1 \|	diff2 \|	blob \| history