DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-06-23 16:05:19 -07:00
parent 7b51bf4f51 d8191f738c
commit bc0c887812
2 changed files with 740 additions and 490 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -41,6 +41,7 @@
"laravel/tinker": "^2.4",
"laravelcollective/html": "^6.0",
"league/csv": "^9.5",
"league/flysystem": "1.1.4",
"league/flysystem-aws-s3-v3": "^1.0",
"league/flysystem-cached-adapter": "^1.0",
"neitanod/forceutf8": "^2.0",

1229
composer.lock generated
View file

File diff suppressed because it is too large Load diff