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

Merge branch 'master' into decrypt_files_again 

Conflicts:
	apps/files_encryption/tests/keymanager.php
parents 7adfc27c d3e2f31a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 188 additions and 141 deletions
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