Merge remote branch 'upstream/develop' into develop-next (4827655e) · 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

4827655e

Commit 4827655e authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

parents d690512a ba0b54e3

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/class.i18n.php 2 additions, 1 deletion

include/class.i18n.php
include/class.plugin.php 1 addition, 0 deletions

include/class.plugin.php
include/staff/system.inc.php 15 additions, 0 deletions

include/staff/system.inc.php
setup/inc/install-prereq.inc.php 1 addition, 0 deletions

setup/inc/install-prereq.inc.php
setup/test/tests/stubs.php 1 addition, 1 deletion

setup/test/tests/stubs.php

with 20 additions and 2 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