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

d2a3d163

Commit d2a3d163 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

parents 21281424 22033909

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/class.config.php 3 additions, 2 deletions

include/class.config.php
include/class.ticket.php 11 additions, 3 deletions

include/class.ticket.php
include/i18n/en_US/config.yaml 1 addition, 1 deletion

include/i18n/en_US/config.yaml
include/staff/settings-tickets.inc.php 5 additions, 3 deletions

include/staff/settings-tickets.inc.php

with 20 additions and 9 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