Merge pull request #21160 from nextcloud/backport/21152/stable18

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

Sat, 6 Jun 2020 07:35:02 +0000 (09:35 +0200)

committer GitHub <noreply@github.com>

Sat, 6 Jun 2020 07:35:02 +0000 (09:35 +0200)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Sat, 6 Jun 2020 07:35:02 +0000 (09:35 +0200)
committer GitHub <noreply@github.com>
Sat, 6 Jun 2020 07:35:02 +0000 (09:35 +0200)
diff --cc lib/private/Share20/Manager.php
Simple merge
diff --cc tests/lib/Share20/ManagerTest.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Sat, 6 Jun 2020 07:35:02 +0000 (09:35 +0200)
committer	GitHub <noreply@github.com>
	Sat, 6 Jun 2020 07:35:02 +0000 (09:35 +0200)
		1	2
lib/private/Share20/Manager.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/Share20/ManagerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history