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

0dad5c45

Commit 0dad5c45 authored 11 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'upstream/develop' into develop

parents cee0f944 07e2dddd

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/class.thread.php 22 additions, 1 deletion

include/class.thread.php
include/class.ticket.php 3 additions, 2 deletions

include/class.ticket.php
include/client/faq-category.inc.php 2 additions, 1 deletion

include/client/faq-category.inc.php
include/client/knowledgebase.inc.php 1 addition, 1 deletion

include/client/knowledgebase.inc.php
include/staff/faq-categories.inc.php 1 addition, 1 deletion

include/staff/faq-categories.inc.php
include/staff/faq-category.inc.php 1 addition, 1 deletion

include/staff/faq-category.inc.php

with 30 additions and 7 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