From: Björn Schießle Date: Wed, 15 May 2013 09:42:41 +0000 (+0200) Subject: Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption X-Git-Tag: v6.0.0alpha2~743^2~73 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=335f2ca32190e866ab1d222b693a273cb6778ac1;p=nextcloud-server.git Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption --- 335f2ca32190e866ab1d222b693a273cb6778ac1