Merge remote-tracking branch 'upstream/develop' into feature/ticket_thread_revisited (4bd816d8) · 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

4bd816d8

Commit 4bd816d8 authored 12 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into feature/ticket_thread_revisited

Conflicts:
	include/class.ticket.php

parents eba99c39 f7649731

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.tickets.php 21 additions, 11 deletions

include/ajax.tickets.php
include/api.cron.php 1 addition, 1 deletion

include/api.cron.php
include/class.api.php 1 addition, 1 deletion

include/class.api.php
include/class.export.php 1 addition, 0 deletions

include/class.export.php
include/class.ticket.php 17 additions, 7 deletions

include/class.ticket.php
include/staff/tickets.inc.php 79 additions, 36 deletions

include/staff/tickets.inc.php
scp/js/scp.js 1 addition, 0 deletions

scp/js/scp.js
scp/tickets.php 7 additions, 7 deletions

scp/tickets.php

with 128 additions and 63 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