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

c8ab7ffa

Commit c8ab7ffa authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.dynamic_forms.php

parents 9484f873 41e44183

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.api.php 1 addition, 1 deletion

include/class.api.php
include/class.client.php 1 addition, 2 deletions

include/class.client.php
include/class.forms.php 13 additions, 3 deletions

include/class.forms.php
include/class.thread.php 2 additions, 2 deletions

include/class.thread.php
include/class.ticket.php 1 addition, 1 deletion

include/class.ticket.php

with 18 additions and 9 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