Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
8a52067f
Commit
8a52067f
authored
5 years ago
by
Peter Rotich
Browse files
Options
Downloads
Plain Diff
Merge remote branch 'upstream/develop' into develop
parents
10da3fcc
9effd2b6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
include/class.import.php
+4
-4
4 additions, 4 deletions
include/class.import.php
include/class.mailfetch.php
+45
-6
45 additions, 6 deletions
include/class.mailfetch.php
include/class.staff.php
+2
-2
2 additions, 2 deletions
include/class.staff.php
include/class.user.php
+1
-1
1 addition, 1 deletion
include/class.user.php
with
52 additions
and
13 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
