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

f2bd2f2b

Commit f2bd2f2b authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Changes up to v1.7.3 released

Conflicts:
	WHATSNEW.md
	css/osticket.css
	scp/css/scp.css

parents eab9f7f2 fcb0d3da

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

UPGRADING.txt 11 additions, 0 deletions

UPGRADING.txt
WHATSNEW.md 69 additions, 0 deletions

WHATSNEW.md
css/osticket.css 4 additions, 0 deletions

css/osticket.css
include/staff/ticket-edit.inc.php 3 additions, 0 deletions

include/staff/ticket-edit.inc.php
scp/css/scp.css 4 additions, 0 deletions

scp/css/scp.css
scp/js/scp.js 11 additions, 1 deletion

scp/js/scp.js
setup/cli/cleanup-codebase.sh 46 additions, 0 deletions

setup/cli/cleanup-codebase.sh

with 148 additions and 1 deletion

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