Merge branch 'develop' into feature/client-interface (24527b5c) · 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

24527b5c

Commit 24527b5c authored 13 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into feature/client-interface

parents 8a3e9f97 d873f53a

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

README.md 15 additions, 4 deletions

README.md
include/class.canned.php 4 additions, 21 deletions

include/class.canned.php
include/class.cron.php 9 additions, 3 deletions

include/class.cron.php
include/class.faq.php 4 additions, 20 deletions

include/class.faq.php
include/class.file.php 18 additions, 0 deletions

include/class.file.php
include/class.filter.php 36 additions, 6 deletions

include/class.filter.php
include/class.ticket.php 16 additions, 12 deletions

include/class.ticket.php
setup/inc/class.setup.php 6 additions, 5 deletions

setup/inc/class.setup.php
setup/install.php 1 addition, 1 deletion

setup/install.php
setup/js/tips.js 47 additions, 60 deletions

setup/js/tips.js

with 156 additions and 132 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