Skip to content
Commit 1bfe9759 authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'master' into files_encryption_upgrade_fix 

Conflicts:
	apps/files_encryption/lib/util.php
parents 96ef9261 d636e168
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