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

411e03cc

Commit 411e03cc authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.forms.php

parents c5bb91d2 9be06d36

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/class.dynamic_forms.php 12 additions, 5 deletions

include/class.dynamic_forms.php
include/class.forms.php 38 additions, 13 deletions

include/class.forms.php
include/class.ticket.php 4 additions, 3 deletions

include/class.ticket.php
include/staff/ticket-open.inc.php 30 additions, 22 deletions

include/staff/ticket-open.inc.php
include/staff/tickets.inc.php 2 additions, 1 deletion

include/staff/tickets.inc.php

with 86 additions and 44 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