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

Merge remote branch 'upstream/v1.9.8' into develop-next

Conflicts:
	include/class.dynamic_forms.php
	include/class.forms.php
	include/class.organization.php
	include/class.staff.php
	include/staff/tickets.inc.php
parents 334b22f7 0a760ef3
No related branches found
No related tags found
No related merge requests found
Showing
with 322 additions and 63 deletions
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