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

b46e2b59

Commit b46e2b59 authored 3 years ago by snipe

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop'

parents f504d7ef 868419b3

No related branches found

No related tags found

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

ansible/ubuntu/vagrant_playbook.yml 1 addition, 1 deletion

ansible/ubuntu/vagrant_playbook.yml
app/Http/Controllers/Api/ComponentsController.php 118 additions, 0 deletions

app/Http/Controllers/Api/ComponentsController.php
public/js/build/app.js 0 additions, 0 deletions

public/js/build/app.js
public/js/dist/all.js 0 additions, 0 deletions

public/js/dist/all.js
public/mix-manifest.json 36 additions, 36 deletions

public/mix-manifest.json
resources/assets/js/vue.js 5 additions, 5 deletions

resources/assets/js/vue.js
routes/api.php 16 additions, 1 deletion

routes/api.php

with 176 additions and 43 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