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

Merge branch 'master' into encryption_improved_error_messages_4617 

Conflicts:
	apps/files/index.php
parents 1558cb86 46f59b16
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