Merge remote branch 'peter/feature/ticket-referral' into feature/ticket-referral (79d57e21) · Commits · docker / osticket · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

osticket
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

79d57e21

Commit 79d57e21 authored 7 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'peter/feature/ticket-referral' into feature/ticket-referral

Conflicts:
	include/class.thread.php
	include/class.ticket.php

parents 84b9ade8 b7fee361

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/class.mailfetch.php 20 additions, 8 deletions

include/class.mailfetch.php
include/class.mailparse.php 14 additions, 9 deletions

include/class.mailparse.php
include/class.thread.php 6 additions, 1 deletion

include/class.thread.php
include/class.ticket.php 23 additions, 1 deletion

include/class.ticket.php

with 63 additions and 19 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 sign in to comment