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

81771ded

Commit 81771ded authored 5 years ago by Peter Rotich

Downloads
- Plain Diff

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

Conflicts:
	include/class.file.php

parents 9db52686 bbfff1a2

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

account.php 1 addition, 0 deletions

account.php
include/class.charset.php 2 additions, 1 deletion

include/class.charset.php
include/class.dynamic_forms.php 2 additions, 1 deletion

include/class.dynamic_forms.php
include/class.file.php 1 addition, 5 deletions

include/class.file.php
include/class.forms.php 18 additions, 0 deletions

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

include/class.search.php

with 25 additions and 8 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