Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

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

Snippets Groups Projects

7d6a6990

Commit 7d6a6990 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.client.php
	include/class.usersession.php

parents feef63ac e628b2f4

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/class.auth.php 2 additions, 2 deletions

include/class.auth.php
include/class.client.php 0 additions, 1 deletion

include/class.client.php
include/class.file.php 14 additions, 0 deletions

include/class.file.php
include/class.mailparse.php 59 additions, 6 deletions

include/class.mailparse.php
include/class.staff.php 1 addition, 1 deletion

include/class.staff.php
include/class.usersession.php 4 additions, 4 deletions

include/class.usersession.php
include/tnef_decoder.php 571 additions, 0 deletions

include/tnef_decoder.php

with 651 additions and 14 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