Merge branch 'hotfix/171' (161a2136) · 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

161a2136

Commit 161a2136 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge branch 'hotfix/171'

parents e5197d6c 1bf95f66

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/class.captcha.php 2 additions, 2 deletions

include/class.captcha.php
include/class.file.php 19 additions, 17 deletions

include/class.file.php
include/class.misc.php 10 additions, 14 deletions

include/class.misc.php
include/class.staff.php 1 addition, 1 deletion

include/class.staff.php
include/ost-sampleconfig.php 1 addition, 1 deletion

include/ost-sampleconfig.php
main.inc.php 7 additions, 8 deletions

main.inc.php
setup/cli/package.php 1 addition, 1 deletion

setup/cli/package.php

with 41 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