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

Merge remote branch 'upstream/develop' into develop-next 

Conflicts:
	include/api.tickets.php
	include/class.client.php
	include/class.mailfetch.php
	include/class.thread.php
	open.php
parents 040fe360 78650a7a
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