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

e54259e0

Commit e54259e0 authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	open.php

parents 9d8c0f2a 9916214f

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/class.forms.php 4 additions, 3 deletions

include/class.forms.php
include/staff/directory.inc.php 1 addition, 1 deletion

include/staff/directory.inc.php
include/staff/settings-alerts.inc.php 4 additions, 2 deletions

include/staff/settings-alerts.inc.php
include/tnef_decoder.php 7 additions, 7 deletions

include/tnef_decoder.php
open.php 3 additions, 1 deletion

open.php
scp/banlist.php 3 additions, 3 deletions

scp/banlist.php
scp/js/scp.js 3 additions, 2 deletions

scp/js/scp.js

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