]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit1174ad0681bb82252a26b5ee44d5b2990171932b
tree77f5d7d2e65e9d5eeedb3f36f0576cb5196ba09e
parentc7e5e30b86733a22ac0d411e00537b10e0220ddd
parent959665003b408ed837066307350fb76b83beaa52
Merge pull request #15445 from owncloud/enc2_migration

add migration script from old encryption to new one
apps/encryption/lib/keymanager.php
settings/js/admin.js