From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Sat, 18 Apr 2015 20:51:15 +0000 (+0200)
Subject: Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
X-Git-Tag: v8.1.0alpha2~36
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cdf82909b8225a885fbf92b78208fb1fe258853e;p=nextcloud-server.git

Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules

Issue/15694 display name of encryption modules
---

cdf82909b8225a885fbf92b78208fb1fe258853e