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

0fdb7428

Commit 0fdb7428 authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

parents 85a4a99a b4ecec0e

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/class.faq.php 1 addition, 1 deletion

include/class.faq.php
include/class.mailer.php 13 additions, 6 deletions

include/class.mailer.php
include/class.thread.php 28 additions, 18 deletions

include/class.thread.php
include/ost-sampleconfig.php 44 additions, 16 deletions

include/ost-sampleconfig.php
scp/js/dashboard.inc.js 1 addition, 0 deletions

scp/js/dashboard.inc.js

with 87 additions and 41 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