Skip to content
Commit 840e96cd authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into disable-anon-upload-master 

Conflicts:
	settings/templates/admin.php
parents 934f2e94 342a54bf
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