Skip to content
Commit 5788d36c authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fixing-1354-master 

Conflicts:
	settings/admin.php
	settings/templates/admin.php
parents 84f3c8b6 35bd7a40
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