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

b20ee52a

Commit b20ee52a authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

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

Conflicts:
	scp/login.php

parents 97d6467e 3849e67b

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/class.client.php 0 additions, 1 deletion

include/class.client.php
include/staff/dashboard.inc.php 12 additions, 0 deletions

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

include/staff/templates/task-view.tmpl.php
include/staff/templates/tasks-actions.tmpl.php 16 additions, 50 deletions

include/staff/templates/tasks-actions.tmpl.php
include/staff/ticket-tasks.inc.php 6 additions, 1 deletion

include/staff/ticket-tasks.inc.php
scp/login.php 7 additions, 2 deletions

scp/login.php

with 46 additions and 56 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