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

cd98e818

Commit cd98e818 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.mailfetch.php
	include/class.mailparse.php
	include/class.thread.php
	scp/js/ticket.js

parents 3868ded2 4f5f852b

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

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

include/class.format.php
include/class.mailfetch.php 2 additions, 0 deletions

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

include/class.mailparse.php
include/class.thread.php 14 additions, 14 deletions

include/class.thread.php
include/class.ticket.php 15 additions, 3 deletions

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

include/class.validator.php
include/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql 5 additions, 0 deletions

include/upgrader/streams/core/f8856d56-abe9c0cb.patch.sql
scp/tickets.php 0 additions, 3 deletions

scp/tickets.php
setup/test/tests/test.validation.php 33 additions, 0 deletions

setup/test/tests/test.validation.php

with 74 additions and 22 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