Skip to content
Snippets Groups Projects
Commit 9fb71af9 authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'master' into encryption_enable_public_upload 

Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php
parents 6443e570 5b7b0536
Branches
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 76 additions and 20 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment