Skip to content
Commit b95bc663 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/util.php
parents d2b288ca ab4ae2b9
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