Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SnipeIt
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ab092fd2

Commit ab092fd2 authored Mar 15, 2021 by snipe

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	app/Providers/AppServiceProvider.php
#	config/logging.php
#	config/services.php

parents f164f0ea c7626f83

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

app/Exceptions/Handler.php 1 addition, 1 deletion

app/Exceptions/Handler.php
app/Helpers/StorageHelper.php 23 additions, 0 deletions

app/Helpers/StorageHelper.php
app/Http/Controllers/Assets/AssetFilesController.php 2 additions, 1 deletion

app/Http/Controllers/Assets/AssetFilesController.php
app/Http/Controllers/Licenses/LicenseFilesController.php 5 additions, 4 deletions

app/Http/Controllers/Licenses/LicenseFilesController.php
app/Http/Controllers/SettingsController.php 2 additions, 1 deletion

app/Http/Controllers/SettingsController.php
app/Http/Controllers/Users/UserFilesController.php 1 addition, 1 deletion

app/Http/Controllers/Users/UserFilesController.php
config/backup.php 3 additions, 0 deletions

config/backup.php
config/logging.php 3 additions, 2 deletions

config/logging.php

with 40 additions and 10 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