Skip to content
Snippets Groups Projects
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
Loading
Showing
with 49 additions and 3 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment