From: Vincent Petry Date: Tue, 14 Apr 2015 16:10:17 +0000 (+0200) Subject: Merge pull request #15612 from owncloud/fix-transifex-master X-Git-Tag: v8.1.0alpha1~13 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2a683369526e33ea495ecce47a8de812f3320bc2;p=nextcloud-server.git Merge pull request #15612 from owncloud/fix-transifex-master files_encryption -> encryption --- 2a683369526e33ea495ecce47a8de812f3320bc2