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

Merge branch 'master' into files_encryption_upgrade_fix 

Conflicts:
	apps/files_encryption/tests/crypt.php
parents 46e5e9bd 3584d48d
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