Merge remote branch 'upstream/develop-next' into develop-next (2f8156ab) · 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

2f8156ab

Commit 2f8156ab authored 11 years ago by Peter Rotich

Downloads
- Plain Diff

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

parents 72d21a3f 65a65cae

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

include/api.tickets.php 9 additions, 0 deletions

include/api.tickets.php
include/class.mailer.php 26 additions, 9 deletions

include/class.mailer.php
include/class.mailfetch.php 62 additions, 5 deletions

include/class.mailfetch.php
include/class.mailparse.php 2 additions, 3 deletions

include/class.mailparse.php
include/class.ostsession.php 4 additions, 2 deletions

include/class.ostsession.php
include/class.staff.php 6 additions, 0 deletions

include/class.staff.php
include/class.ticket.php 4 additions, 0 deletions

include/class.ticket.php
include/tnef_decoder.php 7 additions, 4 deletions

include/tnef_decoder.php
scp/pwreset.php 4 additions, 1 deletion

scp/pwreset.php

with 124 additions and 24 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