Skip to content
Snippets Groups Projects
Commit 5d724803 authored by Jared Hancock's avatar Jared Hancock
Browse files

Merge remote branch 'upstream/develop' into develop-next 

Conflicts:
	WHATSNEW.md
	include/class.ticket.php
	include/class.topic.php
	include/staff/faq-view.inc.php
	include/staff/helptopics.inc.php
parents a420ac95 12207953
No related branches found
No related tags found
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