Merge pull request #1555 from mtmail/setup-escape-shell-args

author Sarah Hoffmann <lonvia@denofr.de>

Wed, 6 Nov 2019 21:47:00 +0000 (22:47 +0100)

committer GitHub <noreply@github.com>

Wed, 6 Nov 2019 21:47:00 +0000 (22:47 +0100)
author Sarah Hoffmann <lonvia@denofr.de>
Wed, 6 Nov 2019 21:47:00 +0000 (22:47 +0100)
committer GitHub <noreply@github.com>
Wed, 6 Nov 2019 21:47:00 +0000 (22:47 +0100)
diff --cc lib/DB.php
Simple merge
diff --cc lib/setup/SetupClass.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 6 Nov 2019 21:47:00 +0000 (22:47 +0100)
committer	GitHub <noreply@github.com>
	Wed, 6 Nov 2019 21:47:00 +0000 (22:47 +0100)
		1	2
lib/DB.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/setup/SetupClass.php	patch \|	diff1 \|	diff2 \|	blob \| history