Skip to content
Commit 232518ac authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #15234 from owncloud/encryption2_core 

core part of encryption 2.0
parents 0cb13300 ff9c85ce
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