Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

osticket
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

990352af

Commit 990352af authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	include/class.dept.php
	include/staff/department.inc.php
	include/staff/tickets.inc.php

parents 91c337aa 590cb463

Branches

Tags

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

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

include/class.config.php
include/class.dept.php 20 additions, 5 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/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
scp/forms.php 1 addition, 0 deletions

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

scp/tickets.php

with 48 additions and 18 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