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

78b16752

Commit 78b16752 authored 7 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'upstream/develop' into develop

parents 9ae093da c4669d77

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 1 addition, 0 deletions

include/ajax.users.php
include/class.cron.php 6 additions, 0 deletions

include/class.cron.php
include/class.ostsession.php 8 additions, 0 deletions

include/class.ostsession.php
include/class.task.php 2 additions, 0 deletions

include/class.task.php
include/staff/templates/task-view.tmpl.php 1 addition, 1 deletion

include/staff/templates/task-view.tmpl.php
include/staff/users.inc.php 1 addition, 0 deletions

include/staff/users.inc.php

with 19 additions and 1 deletion

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