Merge branch 'PHP-7.4'

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

Tue, 13 Aug 2019 09:45:16 +0000 (11:45 +0200)

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

Tue, 13 Aug 2019 09:45:16 +0000 (11:45 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 09:45:16 +0000 (11:45 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 09:45:16 +0000 (11:45 +0200)
diff --cc Zend/zend_gc.c
Simple merge
diff --cc Zend/zend_types.h
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 13 Aug 2019 09:45:16 +0000 (11:45 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 13 Aug 2019 09:45:16 +0000 (11:45 +0200)
		1	2
Zend/zend_gc.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_types.h	patch \|	diff1 \|	diff2 \|	blob \| history