Merge branch 'PHP-7.3' into PHP-7.4

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

Mon, 17 Jun 2019 11:14:18 +0000 (13:14 +0200)

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

Mon, 17 Jun 2019 11:14:18 +0000 (13:14 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 17 Jun 2019 11:14:18 +0000 (13:14 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 17 Jun 2019 11:14:18 +0000 (13:14 +0200)
diff --cc main/main.c
Simple merge
diff --cc main/php_syslog.c
Simple merge
diff --cc main/php_syslog.h
Simple merge
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 17 Jun 2019 11:14:18 +0000 (13:14 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 17 Jun 2019 11:14:18 +0000 (13:14 +0200)
		1	2
main/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php_syslog.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/php_syslog.h	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history