Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Fri, 5 Apr 2019 17:46:11 +0000 (19:46 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Fri, 5 Apr 2019 17:46:11 +0000 (19:46 +0200)
author Peter Kokot <peterkokot@gmail.com>
Fri, 5 Apr 2019 17:46:11 +0000 (19:46 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Fri, 5 Apr 2019 17:46:11 +0000 (19:46 +0200)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Fri, 5 Apr 2019 17:46:11 +0000 (19:46 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Fri, 5 Apr 2019 17:46:11 +0000 (19:46 +0200)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history