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

Merge branch 'master' into files_encryption_check_private_key 

Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
parents 20ddd6e1 dd801192
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