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

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

Include changes made just before 1.7.3 release

Conflicts:
	include/ajax.config.php
	include/class.ticket.php
parents 844589ca 9792dfb8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 157 deletions
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