Skip to content
Commit 80433fc4 authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'master' into file_encryption_util_is_error 

Conflicts:
	apps/files_encryption/lib/util.php
parents 89f0c8f3 5e243b48
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