Skip to content
Commit 44d201a5 authored by Björn Schießle's avatar Björn Schießle
Browse files

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

parents 5ba8d38b c458e785
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