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

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

Conflicts:
	include/class.ticket.php
	include/class.user.php
	include/i18n/en_US/help/tips/settings.alerts.yaml
	include/staff/department.inc.php
	include/staff/settings-alerts.inc.php
	include/staff/slaplan.inc.php
	include/staff/ticket-view.inc.php
parents aa601524 29a17999
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 349 additions and 182 deletions
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