summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-06-13 10:49:23 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-06-13 10:49:23 +0200
commitfd5042cc460ec35112cc69928e441b5395142190 (patch)
tree4cb1e39799043b7132c9e347b35554e2c4187f3e
parent2f1005f05fda3f2df5a02e1faf976682b5af319f (diff)
parent2daec351d4fc8754a89422faea21dd0c84df40bf (diff)
downloadnextcloud-server-fd5042cc460ec35112cc69928e441b5395142190.tar.gz
nextcloud-server-fd5042cc460ec35112cc69928e441b5395142190.zip
Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix
m---------3rdparty0
1 files changed, 0 insertions, 0 deletions
diff --git a/3rdparty b/3rdparty
-Subproject a13af72fbe8983686fc47489a750e60319f68ac
+Subproject 3ef9f738a9107879dddc7d97842cf4d2198fae4