]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7e5e30 9596650)
Merge pull request #15445 from owncloud/enc2_migration
authorClark Tomlinson <fallen013@gmail.com>
Thu, 16 Apr 2015 13:34:47 +0000 (09:34 -0400)
committerClark Tomlinson <fallen013@gmail.com>
Thu, 16 Apr 2015 13:34:47 +0000 (09:34 -0400)
add migration script from old encryption to new one

1  2 
apps/encryption/lib/keymanager.php patch | diff1 | diff2 | blob | history
settings/js/admin.js patch | diff1 | diff2 | blob | history

diff --cc apps/encryption/lib/keymanager.php
Simple merge
diff --cc settings/js/admin.js
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server