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

Merge branch 'master' into encryption_work_with_public_gallery 

Conflicts:
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/crypt.php
parents 2b361ea0 391f267d
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