Merge branch 'issue/sql-whoops' into feature/csrf-tokens (4b43093c) · 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

4b43093c

Commit 4b43093c authored 12 years ago by Jared Hancock

Downloads
- Plain Diff

Merge branch 'issue/sql-whoops' into feature/csrf-tokens

parents 821d7b0e 70aca893

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

include/class.team.php 3 additions, 1 deletion

include/class.team.php
scp/apikeys.php 4 additions, 2 deletions

scp/apikeys.php
scp/banlist.php 8 additions, 4 deletions

scp/banlist.php
scp/canned.php 4 additions, 2 deletions

scp/canned.php
scp/categories.php 4 additions, 2 deletions

scp/categories.php
scp/departments.php 7 additions, 3 deletions

scp/departments.php
scp/emails.php 4 additions, 1 deletion

scp/emails.php
scp/filters.php 4 additions, 2 deletions

scp/filters.php
scp/groups.php 4 additions, 2 deletions

scp/groups.php
scp/helptopics.php 4 additions, 2 deletions

scp/helptopics.php
scp/slas.php 4 additions, 2 deletions

scp/slas.php
scp/staff.php 2 additions, 1 deletion

scp/staff.php
scp/syslogs.php 2 additions, 1 deletion

scp/syslogs.php
scp/teams.php 4 additions, 2 deletions

scp/teams.php
scp/templates.php 2 additions, 1 deletion

scp/templates.php

with 60 additions and 28 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