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

53afbc0b

Commit 53afbc0b authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

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

Conflicts:
	include/class.forms.php

parents 6626cc4b 84943083

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

include/class.auth.php 28 additions, 0 deletions

include/class.auth.php
include/class.client.php 3 additions, 1 deletion

include/class.client.php
include/class.config.php 14 additions, 0 deletions

include/class.config.php
include/class.cron.php 6 additions, 0 deletions

include/class.cron.php
include/class.forms.php 44 additions, 27 deletions

include/class.forms.php
include/class.mailer.php 3 additions, 3 deletions

include/class.mailer.php
include/class.staff.php 5 additions, 0 deletions

include/class.staff.php
include/class.user.php 2 additions, 0 deletions

include/class.user.php
include/class.variable.php 2 additions, 2 deletions

include/class.variable.php
include/staff/tasks.inc.php 5 additions, 5 deletions

include/staff/tasks.inc.php

with 112 additions and 38 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