Merge branch 'develop' into develop-next (a4b057a0) · 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

a4b057a0

Commit a4b057a0 authored 9 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	include/class.ticket.php

parents b141fe8a 8295dfde

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

include/class.filter.php 1 addition, 1 deletion

include/class.filter.php
include/class.ticket.php 13 additions, 14 deletions

include/class.ticket.php
include/pear/BUNDLE 6 additions, 0 deletions

include/pear/BUNDLE
include/pear/Mail/mime.php 603 additions, 450 deletions

include/pear/Mail/mime.php
include/pear/Mail/mimePart.php 237 additions, 216 deletions

include/pear/Mail/mimePart.php
include/pear/Net/SMTP.php 353 additions, 444 deletions

include/pear/Net/SMTP.php

with 1213 additions and 1125 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