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

abf74647

Commit abf74647 authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/staff/dynamic-form.inc.php

parents 60f049bc b11b5282

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/staff/dynamic-form.inc.php 5 additions, 2 deletions

include/staff/dynamic-form.inc.php
include/staff/header.inc.php 2 additions, 2 deletions

include/staff/header.inc.php
scp/forms.php 18 additions, 9 deletions

scp/forms.php
setup/cli/modules/deploy.php 40 additions, 25 deletions

setup/cli/modules/deploy.php
setup/cli/modules/unpack.php 5 additions, 1 deletion

setup/cli/modules/unpack.php
setup/cli/package.php 6 additions, 0 deletions

setup/cli/package.php

with 76 additions and 39 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