From: Jan-Christoph Borchardt Date: Mon, 23 Mar 2015 15:46:53 +0000 (+0100) Subject: Merge pull request #15114 from owncloud/sharing-labels X-Git-Tag: v8.1.0alpha1~218 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c93e4c806a0a39c2be4ee0e14ad0fd29f43ef730;p=nextcloud-server.git Merge pull request #15114 from owncloud/sharing-labels combine labels with inputs in sharing dialog, fix #14796 --- c93e4c806a0a39c2be4ee0e14ad0fd29f43ef730