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

Merge branch 'master' into encryption_check_if_file_is_encrypted

parents f3e2a637 30b8f4ec
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