Merge remote branch 'upstream/develop' into develop-next (56fd5521) · 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

56fd5521

Commit 56fd5521 authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/client/view.inc.php
	js/osticket.js

parents 184cf25f 49deb1bc

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

css/osticket.css 3 additions, 2 deletions

css/osticket.css
include/class.format.php 3 additions, 3 deletions

include/class.format.php
include/client/view.inc.php 6 additions, 1 deletion

include/client/view.inc.php
js/osticket.js 34 additions, 34 deletions

js/osticket.js
scp/css/scp.css 7 additions, 2 deletions

scp/css/scp.css
scp/js/ticket.js 1 addition, 1 deletion

scp/js/ticket.js

with 54 additions and 43 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