Skip to content
Commit 2c3c60c1 authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'master' into remove_unused_vars 

Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php
parents c81e34ef 4c05259c
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