Merge branch 'PHP-7.3' into PHP-7.4

author Christoph M. Becker <cmbecker69@gmx.de>

Wed, 26 Aug 2020 12:52:09 +0000 (14:52 +0200)

committer Christoph M. Becker <cmbecker69@gmx.de>

Wed, 26 Aug 2020 12:53:46 +0000 (14:53 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Wed, 26 Aug 2020 12:52:09 +0000 (14:52 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Wed, 26 Aug 2020 12:53:46 +0000 (14:53 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/com_dotnet/com_com.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Wed, 26 Aug 2020 12:52:09 +0000 (14:52 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Wed, 26 Aug 2020 12:53:46 +0000 (14:53 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/com_dotnet/com_com.c	patch \|	diff1 \|	diff2 \|	blob \| history