Merge pull request #18079 from nextcloud/fixes/phpcs

author Roeland Jago Douma <rullzer@users.noreply.github.com>

Mon, 25 Nov 2019 13:07:00 +0000 (14:07 +0100)

committer GitHub <noreply@github.com>

Mon, 25 Nov 2019 13:07:00 +0000 (14:07 +0100)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Mon, 25 Nov 2019 13:07:00 +0000 (14:07 +0100)
committer GitHub <noreply@github.com>
Mon, 25 Nov 2019 13:07:00 +0000 (14:07 +0100)
diff --cc apps/files_sharing/lib/Controller/ShareAPIController.php
Simple merge
diff --cc core/Command/Db/ConvertType.php
Simple merge
diff --cc core/Controller/SvgController.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Mon, 25 Nov 2019 13:07:00 +0000 (14:07 +0100)
committer	GitHub <noreply@github.com>
	Mon, 25 Nov 2019 13:07:00 +0000 (14:07 +0100)
		1	2
apps/files_sharing/lib/Controller/ShareAPIController.php	patch \|	diff1 \|	diff2 \|	blob \| history
core/Command/Db/ConvertType.php	patch \|	diff1 \|	diff2 \|	blob \| history
core/Controller/SvgController.php	patch \|	diff1 \|	diff2 \|	blob \| history