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

3b12f56e

Commit 3b12f56e authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.thread.php
	include/staff/header.inc.php

parents 9c8dfd92 7044ac71

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

include/class.config.php 1 addition, 0 deletions

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

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

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

include/class.user.php
include/staff/header.inc.php 1 addition, 1 deletion

include/staff/header.inc.php
include/staff/system.inc.php 1 addition, 1 deletion

include/staff/system.inc.php
include/staff/tickets.inc.php 1 addition, 1 deletion

include/staff/tickets.inc.php
include/staff/tpl.inc.php 1 addition, 1 deletion

include/staff/tpl.inc.php
setup/cli/modules/user.php 3 additions, 0 deletions

setup/cli/modules/user.php

with 26 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