From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 16 Apr 2015 09:57:14 +0000 (+0200)
Subject: Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master
X-Git-Tag: v8.1.0alpha2~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=99b0c6e525e71de18245ba434852389349b4f2d7;p=nextcloud-server.git

Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master

files_encryption -> encryption
---

99b0c6e525e71de18245ba434852389349b4f2d7