Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix

12 years ago · fd5042cc46
parent 2f1005f05f 2daec351d4
commit fd5042cc46
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
+Subproject commit 3ef9f738a9107879dddc7d97842cf4d2198fae4c