Merge pull request #1887 from nextcloud/downstream-26370

author Morris Jobke <hey@morrisjobke.de>

Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)

committer GitHub <noreply@github.com>

Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)
author Morris Jobke <hey@morrisjobke.de>
Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)
committer GitHub <noreply@github.com>
Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)
diff --cc apps/files_sharing/lib/Controller/ShareAPIController.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)
committer	GitHub <noreply@github.com>
	Wed, 2 Nov 2016 13:57:45 +0000 (14:57 +0100)