From: Christoph Wurst <ChristophWurst@users.noreply.github.com>
Date: Mon, 29 Aug 2016 17:48:51 +0000 (+0200)
Subject: Merge pull request #1115 from nextcloud/fix_146
X-Git-Tag: v11.0RC2~734
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=907e832de4ee4292345bdc1cfd814e6bfd5c7ea4;p=nextcloud-server.git

Merge pull request #1115 from nextcloud/fix_146

Link 'Allow editing' => 'Allow upload and editing'
---

907e832de4ee4292345bdc1cfd814e6bfd5c7ea4