Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
f298a4d5
Commit
f298a4d5
authored
6 years ago
by
Peter Rotich
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into develop-next
Conflicts: js/redactor-osticket.js
parents
f35d005a
c0b29679
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/client/tickets.inc.php
+5
-5
5 additions, 5 deletions
include/client/tickets.inc.php
js/redactor-osticket.js
+19
-3
19 additions, 3 deletions
js/redactor-osticket.js
scp/js/scp.js
+2
-1
2 additions, 1 deletion
scp/js/scp.js
with
26 additions
and
9 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
