]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_en...
authorBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 08:49:23 +0000 (10:49 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 08:49:23 +0000 (10:49 +0200)
commitfd5042cc460ec35112cc69928e441b5395142190
tree4cb1e39799043b7132c9e347b35554e2c4187f3e
parent2f1005f05fda3f2df5a02e1faf976682b5af319f
parent2daec351d4fc8754a89422faea21dd0c84df40bf
Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix