Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

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

Snippets Groups Projects

7b51bf4f

Commit 7b51bf4f authored 3 years ago by snipe

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop'

parents 7b5a6a00 450183c5

No related branches found

No related tags found

Loading

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

.all-contributorsrc 18 additions, 0 deletions

.all-contributorsrc
README.md 2 additions, 1 deletion

README.md
app/Http/Controllers/Api/AssetsController.php 3 additions, 0 deletions

app/Http/Controllers/Api/AssetsController.php
app/Http/Controllers/Api/StatuslabelsController.php 1 addition, 4 deletions

app/Http/Controllers/Api/StatuslabelsController.php
docker/startup.sh 1 addition, 1 deletion

docker/startup.sh
resources/views/users/print.blade.php 2 additions, 2 deletions

resources/views/users/print.blade.php

with 27 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