Merge remote branch 'upstream-1.7/develop' into develop (7faf3026) · 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

7faf3026

Commit 7faf3026 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge remote branch 'upstream-1.7/develop' into develop

Conflicts:
	include/mysqli.php
	include/staff/faq-categories.inc.php
	setup/tips.html

parents 49cda3d6 95e6c674

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/client/knowledgebase.inc.php 4 additions, 1 deletion

include/client/knowledgebase.inc.php
include/mysqli.php 4 additions, 3 deletions

include/mysqli.php
include/staff/faq-categories.inc.php 6 additions, 2 deletions

include/staff/faq-categories.inc.php
setup/tips.html 1 addition, 1 deletion

setup/tips.html

with 15 additions and 7 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