Skip to content
Commit 99b0c6e5 authored by Joas Schilling's avatar Joas Schilling
Browse files

Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master 

files_encryption -> encryption
parents 2e06cf49 b6f79567
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