Skip to content
Commit fadb1125 authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Merge branch 'master' into fixing-bugtracker-link-master 

Conflicts:
	core/templates/exception.php
	settings/templates/help.php
parents f9b454da 8e5bbace
Expand all 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