Merge branch 'develop' into develop-next (263110c8) · 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

263110c8

Commit 263110c8 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

parents e601405e 1fdd6783

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

include/class.attachment.php 11 additions, 3 deletions

include/class.attachment.php
include/class.filter.php 1 addition, 1 deletion

include/class.filter.php
include/class.forms.php 12 additions, 13 deletions

include/class.forms.php
include/class.role.php 10 additions, 0 deletions

include/class.role.php
include/staff/ticket-tasks.inc.php 7 additions, 3 deletions

include/staff/ticket-tasks.inc.php
scp/canned.php 7 additions, 0 deletions

scp/canned.php
scp/faq.php 15 additions, 15 deletions

scp/faq.php
setup/test/tests/test.git-conflicts.php 27 additions, 0 deletions

setup/test/tests/test.git-conflicts.php

with 90 additions and 35 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