Skip to content
Commit 313631ed authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'master' into file_encryption_external_storage_fixes 

Conflicts:
	apps/files_encryption/hooks/hooks.php
parents 1337f48d 2ce555fe
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