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

590cb463

Commit 590cb463 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'upstream/develop' into develop

parents 565737a2 a24c8844

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

include/class.config.php 7 additions, 0 deletions

include/class.config.php
include/class.dept.php 22 additions, 7 deletions

include/class.dept.php
include/class.format.php 7 additions, 2 deletions

include/class.format.php
include/class.thread.php 3 additions, 3 deletions

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

include/class.user.php
include/cli/modules/unpack.php 1 addition, 1 deletion

include/cli/modules/unpack.php
include/staff/department.inc.php 1 addition, 0 deletions

include/staff/department.inc.php
include/staff/helptopic.inc.php 1 addition, 1 deletion

include/staff/helptopic.inc.php
include/staff/system.inc.php 5 additions, 3 deletions

include/staff/system.inc.php
include/staff/tickets.inc.php 4 additions, 1 deletion

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

scp/forms.php
scp/tickets.php 2 additions, 2 deletions

scp/tickets.php

with 55 additions and 21 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