Skip to content
Commit 28270046 authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption

parents 37c72059 a4364a93
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