Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

This commit is contained in:
snipe 2021-02-02 20:30:36 -08:00
commit a2e177e754
2 changed files with 1607 additions and 554 deletions

View file

@ -34,9 +34,9 @@
"guzzlehttp/guzzle": "^6.5", "guzzlehttp/guzzle": "^6.5",
"intervention/image": "^2.5", "intervention/image": "^2.5",
"javiereguiluz/easyslugger": "^1.0", "javiereguiluz/easyslugger": "^1.0",
"laravel/framework": "^6.0", "laravel/framework": "^6.20",
"laravel/helpers": "^1.2", "laravel/helpers": "^1.2",
"laravel/passport": "^8.4", "laravel/passport": "^9.3.2",
"laravel/slack-notification-channel": "^2.0", "laravel/slack-notification-channel": "^2.0",
"laravel/tinker": "^2.4", "laravel/tinker": "^2.4",
"laravelcollective/html": "^6.0", "laravelcollective/html": "^6.0",

2157
composer.lock generated

File diff suppressed because it is too large Load diff