Merge branch 'develop' into develop-next (bd8aa480) · 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

bd8aa480

Commit bd8aa480 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	include/staff/tickets.inc.php

parents 56178c6f cc584e58

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.tickets.php 5 additions, 3 deletions

include/ajax.tickets.php
include/class.dynamic_forms.php 34 additions, 8 deletions

include/class.dynamic_forms.php
include/class.staff.php 18 additions, 2 deletions

include/class.staff.php
include/staff/tickets.inc.php 9 additions, 14 deletions

include/staff/tickets.inc.php
setup/doc/signals.md 31 additions, 5 deletions

setup/doc/signals.md

with 97 additions and 32 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