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

Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 

Conflicts:
	apps/files_encryption/lib/stream.php
parents b27fc42e 2b361ea0
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