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

6e5dd23e

Commit 6e5dd23e authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.user.php
	include/staff/tickets.inc.php

parents 2e07ebeb 2711f3c8

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.tickets.php 4 additions, 2 deletions

include/ajax.tickets.php
include/class.format.php 2 additions, 1 deletion

include/class.format.php
include/class.ticket.php 3 additions, 2 deletions

include/class.ticket.php
include/class.user.php 3 additions, 2 deletions

include/class.user.php
include/mysqli.php 1 addition, 1 deletion

include/mysqli.php
include/staff/department.inc.php 1 addition, 7 deletions

include/staff/department.inc.php
include/staff/tickets.inc.php 9 additions, 7 deletions

include/staff/tickets.inc.php
js/osticket.js 2 additions, 1 deletion

js/osticket.js
scp/js/scp.js 1 addition, 1 deletion

scp/js/scp.js
scp/js/ticket.js 2 additions, 1 deletion

scp/js/ticket.js

with 28 additions and 25 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