Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Mon, 29 Apr 2019 20:35:24 +0000 (22:35 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Mon, 29 Apr 2019 20:35:24 +0000 (22:35 +0200)
author Peter Kokot <peterkokot@gmail.com>
Mon, 29 Apr 2019 20:35:24 +0000 (22:35 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Mon, 29 Apr 2019 20:35:24 +0000 (22:35 +0200)
diff --cc .gitignore
Simple merge
diff --cc TSRM/TSRM.h
Simple merge
diff --cc configure.ac
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Mon, 29 Apr 2019 20:35:24 +0000 (22:35 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Mon, 29 Apr 2019 20:35:24 +0000 (22:35 +0200)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
TSRM/TSRM.h	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history