Merge pull request #15155 from owncloud/share-donotreturntrashedfiles

author Morris Jobke <hey@morrisjobke.de>

Fri, 27 Mar 2015 16:05:14 +0000 (17:05 +0100)

committer Morris Jobke <hey@morrisjobke.de>

Fri, 27 Mar 2015 16:05:14 +0000 (17:05 +0100)
author Morris Jobke <hey@morrisjobke.de>
Fri, 27 Mar 2015 16:05:14 +0000 (17:05 +0100)
committer Morris Jobke <hey@morrisjobke.de>
Fri, 27 Mar 2015 16:05:14 +0000 (17:05 +0100)
diff --cc lib/private/share/share.php
Simple merge
diff --cc tests/lib/share/share.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Fri, 27 Mar 2015 16:05:14 +0000 (17:05 +0100)
committer	Morris Jobke <hey@morrisjobke.de>
	Fri, 27 Mar 2015 16:05:14 +0000 (17:05 +0100)
		1	2
lib/private/share/share.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/share/share.php	patch \|	diff1 \|	diff2 \|	blob \| history