Skip to content
Snippets Groups Projects
Commit e3219829 authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge branch '1.10.x' into develop-next 

Conflicts:
	WHATSNEW.md
	include/class.dept.php
	include/staff/department.inc.php
	include/staff/tickets.inc.php
parents 3db4163a 035fd0af
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