Merge pull request #19349 from nextcloud/bugfix/noid/prevent-download-on-secure-view

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

Sat, 8 Feb 2020 09:18:24 +0000 (10:18 +0100)

committer GitHub <noreply@github.com>

Sat, 8 Feb 2020 09:18:24 +0000 (10:18 +0100)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Sat, 8 Feb 2020 09:18:24 +0000 (10:18 +0100)
committer GitHub <noreply@github.com>
Sat, 8 Feb 2020 09:18:24 +0000 (10:18 +0100)
diff --cc apps/files_sharing/lib/Controller/ShareController.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Sat, 8 Feb 2020 09:18:24 +0000 (10:18 +0100)
committer	GitHub <noreply@github.com>
	Sat, 8 Feb 2020 09:18:24 +0000 (10:18 +0100)