Merge branch 'develop' into feature/csrf (13104032) · 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

13104032

Commit 13104032 authored 12 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into feature/csrf

parents 09149f58 72a55009

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/class.canned.php 20 additions, 1 deletion

include/class.canned.php
include/class.filter.php 30 additions, 6 deletions

include/class.filter.php
include/class.ticket.php 2 additions, 1 deletion

include/class.ticket.php
include/staff/cannedreplies.inc.php 2 additions, 1 deletion

include/staff/cannedreplies.inc.php
include/staff/cannedreply.inc.php 5 additions, 0 deletions

include/staff/cannedreply.inc.php
include/staff/filter.inc.php 8 additions, 8 deletions

include/staff/filter.inc.php

with 67 additions and 17 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