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

d3b3acbf

Commit d3b3acbf authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.mailparse.php

parents 62da338a 4a67fa3b

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

bootstrap.php 12 additions, 3 deletions

bootstrap.php
include/ajax.reports.php 26 additions, 25 deletions

include/ajax.reports.php
include/class.config.php 1 addition, 1 deletion

include/class.config.php
include/class.format.php 0 additions, 3 deletions

include/class.format.php
include/class.mailparse.php 16 additions, 1 deletion

include/class.mailparse.php

with 55 additions and 33 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