Merge pull request #22109 from nextcloud/feature/20931/followup-1

author John Molakvoæ <skjnldsv@users.noreply.github.com>

Mon, 17 Aug 2020 20:13:45 +0000 (22:13 +0200)

committer GitHub <noreply@github.com>

Mon, 17 Aug 2020 20:13:45 +0000 (22:13 +0200)
author John Molakvoæ <skjnldsv@users.noreply.github.com>
Mon, 17 Aug 2020 20:13:45 +0000 (22:13 +0200)
committer GitHub <noreply@github.com>
Mon, 17 Aug 2020 20:13:45 +0000 (22:13 +0200)
diff --cc apps/files_sharing/lib/Controller/ShareAPIController.php
Simple merge
author	John Molakvoæ <skjnldsv@users.noreply.github.com>
	Mon, 17 Aug 2020 20:13:45 +0000 (22:13 +0200)
committer	GitHub <noreply@github.com>
	Mon, 17 Aug 2020 20:13:45 +0000 (22:13 +0200)