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

264f33e5

Commit 264f33e5 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	setup/test/tests/stubs.php

parents 1f2b4339 12da45f9

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/class.mailfetch.php 5 additions, 2 deletions

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

include/class.mailparse.php
include/tnef_decoder.php 13 additions, 2 deletions

include/tnef_decoder.php
setup/test/tests/stubs.php 6 additions, 0 deletions

setup/test/tests/stubs.php

with 27 additions and 6 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