Merge upstream develop to fix merge conflict (55a7a39f) · 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

55a7a39f

Commit 55a7a39f authored 12 years ago by Peter Rotich

Downloads
- Plain Diff

Merge upstream develop to fix merge conflict

parents 7fea9f16 ad83db89

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/.htaccess 1 addition, 0 deletions

include/.htaccess
include/class.canned.php 2 additions, 0 deletions

include/class.canned.php
include/class.pdf.php 13 additions, 1 deletion

include/class.pdf.php
include/staff/login.tpl.php 6 additions, 0 deletions

include/staff/login.tpl.php
include/staff/settings-autoresp.inc.php 1 addition, 0 deletions

include/staff/settings-autoresp.inc.php
setup/setup.inc.php 8 additions, 2 deletions

setup/setup.inc.php

with 31 additions and 3 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