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

33d69252

Commit 33d69252 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

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

parents df65034a e60b5c0a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.users.php 3 additions, 1 deletion

include/ajax.users.php
include/class.forms.php 1 addition, 1 deletion

include/class.forms.php
include/class.organization.php 1 addition, 1 deletion

include/class.organization.php
include/class.ticket.php 1 addition, 1 deletion

include/class.ticket.php
include/i18n/en_US/help/tips/settings.email.yaml 1 addition, 1 deletion

include/i18n/en_US/help/tips/settings.email.yaml
scp/js/scp.js 1 addition, 1 deletion

scp/js/scp.js

with 8 additions and 6 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