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

72e66bb9

Commit 72e66bb9 authored 5 years ago by Peter Rotich

Downloads
- Plain Diff

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

Conflicts:
	include/class.forms.php

parents 875fcf6e 9e5a4769

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/class.export.php 7 additions, 1 deletion

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

include/class.format.php
include/class.forms.php 10 additions, 6 deletions

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

include/class.user.php
include/class.validator.php 5 additions, 0 deletions

include/class.validator.php
setup/inc/class.installer.php 2 additions, 2 deletions

setup/inc/class.installer.php

with 26 additions and 11 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