Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)
author Peter Kokot <peterkokot@gmail.com>
Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)
diff --cc .travis.yml
Simple merge
diff --cc EXTENSIONS
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
EXTENSIONS	patch \|	diff1 \|	diff2 \|	blob \| history