From: Björn Schießle Date: Thu, 13 Jun 2013 08:49:23 +0000 (+0200) Subject: Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_en... X-Git-Tag: v6.0.0alpha2~642^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd5042cc460ec35112cc69928e441b5395142190;p=nextcloud-server.git Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix --- fd5042cc460ec35112cc69928e441b5395142190