Merge branch 'PHP-7.2'

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

Tue, 13 Mar 2018 23:01:46 +0000 (00:01 +0100)

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

Tue, 13 Mar 2018 23:01:46 +0000 (00:01 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Tue, 13 Mar 2018 23:01:46 +0000 (00:01 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Tue, 13 Mar 2018 23:01:46 +0000 (00:01 +0100)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Tue, 13 Mar 2018 23:01:46 +0000 (00:01 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Tue, 13 Mar 2018 23:01:46 +0000 (00:01 +0100)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history