Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php |
||
---|---|---|
.. | ||
adminrecovery.php | ||
userrecovery.php |
Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php |
||
---|---|---|
.. | ||
adminrecovery.php | ||
userrecovery.php |