Skip to content
Commit 9fac95c2 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into scrutinizer_documentation_patches 

Conflicts:
	lib/private/appconfig.php
parents b330d07b df282d9e
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