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

Merge branch 'feature/browser-truncate' into feature/list-management 

Conflicts:
	assets/default/css/theme.css
	include/client/tickets.inc.php
	include/staff/templates/tickets.tmpl.php
	include/staff/ticket-view.inc.php
	include/staff/tickets.inc.php
	scp/css/scp.css
parents d667c8b1 51d3d240
No related branches found
No related tags found
No related merge requests 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