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

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

Conflicts:
	WHATSNEW.md
	include/class.dynamic_forms.php
	include/class.mailer.php
	include/class.thread.php
	include/class.ticket.php
	include/staff/filter.inc.php
parents c8e86cc5 2ee07424
No related branches found
No related tags found
Loading
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