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

Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core... 

Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery
parents 9c4b8ae5 2a465fb2
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