Merge branch 'develop' into 1.10.x (852a8d08) · 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

852a8d08

Commit 852a8d08 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into 1.10.x

parents 64597d38 e4b3fcd3

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/client/templates/thread-entries.tmpl.php 2 additions, 0 deletions

include/client/templates/thread-entries.tmpl.php
include/client/tickets.inc.php 5 additions, 5 deletions

include/client/tickets.inc.php
js/redactor-osticket.js 22 additions, 5 deletions

js/redactor-osticket.js
scp/js/scp.js 2 additions, 1 deletion

scp/js/scp.js

with 31 additions and 11 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