Skip to content
Commit aa648fca authored by Sam Tuke's avatar Sam Tuke
Browse files

Merge branch 'master' into files_encryption 

Conflicts:
	apps/files_encryption/templates/settings.php
parents ca454f02 dd40b691
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