Skip to content
Snippets Groups Projects
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
Branches
No related tags found
No related merge requests found
Showing
with 286 additions and 289 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment