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

43bf186d

Commit 43bf186d authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'upstream/develop' into develop

parents 8c848b59 18fe21b9

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

include/class.file.php 1 addition, 1 deletion

include/class.file.php
include/class.format.php 3 additions, 2 deletions

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

include/class.forms.php
include/class.mailfetch.php 2 additions, 2 deletions

include/class.mailfetch.php
include/class.orm.php 11 additions, 8 deletions

include/class.orm.php
include/class.upgrader.php 4 additions, 0 deletions

include/class.upgrader.php
include/client/header.inc.php 1 addition, 0 deletions

include/client/header.inc.php
include/staff/header.inc.php 1 addition, 0 deletions

include/staff/header.inc.php
include/staff/login.header.php 1 addition, 0 deletions

include/staff/login.header.php
include/staff/system.inc.php 11 additions, 1 deletion

include/staff/system.inc.php
include/staff/templates/task-view.tmpl.php 2 additions, 2 deletions

include/staff/templates/task-view.tmpl.php
include/staff/templates/users.tmpl.php 12 additions, 7 deletions

include/staff/templates/users.tmpl.php
setup/inc/header.inc.php 1 addition, 0 deletions

setup/inc/header.inc.php

with 51 additions and 24 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