Skip to content
Commit 3b9e2f1b authored by Sam Tuke's avatar Sam Tuke
Browse files

Merge branch 'master' into files_encryption-style-fixes 

Conflicts:
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
parents a528f96b e6400b30
Expand all 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