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

Merge branch 'develop-next' into HEAD

Merging feature/multilingual-phase-ii

Conflicts:
	include/class.config.php
	include/class.dynamic_forms.php
	include/class.forms.php
	include/class.ticket.php
	include/staff/dynamic-list.inc.php
	include/staff/dynamic-lists.inc.php
	include/staff/filter.inc.php
	include/staff/helptopic.inc.php
	include/staff/settings-tickets.inc.php
	include/staff/templates/list-item-properties.tmpl.php
	include/staff/ticket-view.inc.php
	scp/lists.php
	scp/tickets.php
parents 8d06d690 b9ab664d
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment