Skip to content
Commit 46a328a7 authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Merge pull request #18873 from owncloud/enc_use_master_password 

Allow admin to use a master key for all files
parents 6b22006f b2e6d7b5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment