Skip to content
Commit 7086c386 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into append-error-document

Conflicts:
	lib/private/setup.php
	lib/private/updater.php
parents 229e3dcb 73dd5ff2
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