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

Merge branch 'master' into encryption_check_php_version 

Conflicts:
	apps/files_encryption/files/error.php
parents 38ed0039 29dd7eda
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