Merge remote branch 'upstream-1.7/develop' into develop (d99fdf29) · 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

d99fdf29

Commit d99fdf29 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Include changes post 1.7.2

Conflicts:
	include/class.file.php
	main.inc.php

parents 6b9a51a3 22ac99d5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/class.crypto.php 8 additions, 4 deletions

include/class.crypto.php
include/class.file.php 4 additions, 7 deletions

include/class.file.php
include/class.format.php 2 additions, 2 deletions

include/class.format.php
include/class.mailfetch.php 9 additions, 5 deletions

include/class.mailfetch.php
include/class.mailparse.php 22 additions, 8 deletions

include/class.mailparse.php
include/class.ticket.php 2 additions, 1 deletion

include/class.ticket.php

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