Skip to content

Commit bb95c23

Browse files
committed
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2 parents 282fed2 + dcea14f commit bb95c23

File tree

2 files changed

+65
-117
lines changed

2 files changed

+65
-117
lines changed

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,26 @@
3434
"eduardokum/laravel-mail-auto-embed": "^2.0",
3535
"enshrined/svg-sanitize": "^0.15.0",
3636
"erusev/parsedown": "^1.7",
37-
"spatie/laravel-ignition": "^2.0",
3837
"guzzlehttp/guzzle": "^7.0.1",
3938
"intervention/image": "^2.5",
4039
"javiereguiluz/easyslugger": "^1.0",
41-
"laravel/framework": "^10.0",
4240
"laravel-notification-channels/google-chat": "^3.0",
4341
"laravel-notification-channels/microsoft-teams": "^1.1",
42+
"laravel/framework": "^10.0",
4443
"laravel/helpers": "^1.4",
4544
"laravel/passport": "^11.0",
4645
"laravel/slack-notification-channel": "^2.3",
4746
"laravel/socialite": "^5.6",
4847
"laravel/tinker": "^2.6",
4948
"laravel/ui": "^4.0",
5049
"laravelcollective/html": "^6.2",
51-
"lcobucci/clock": "^1.2.0|^2.0.0",
52-
"lcobucci/jwt": "^3.4.5|^4.0.4",
5350
"league/csv": "^9.7",
5451
"league/flysystem-aws-s3-v3": "^3.0",
5552
"livewire/livewire": "^2.4",
5653
"neitanod/forceutf8": "^2.0",
5754
"nesbot/carbon": "^2.32",
5855
"nunomaduro/collision": "^6.1",
56+
"okvpn/clock-lts": "^1.0",
5957
"onelogin/php-saml": "^3.4",
6058
"paragonie/constant_time_encoding": "^2.3",
6159
"paragonie/sodium_compat": "^1.19",
@@ -64,6 +62,7 @@
6462
"pragmarx/google2fa-laravel": "^1.3",
6563
"rollbar/rollbar-laravel": "^8.0",
6664
"spatie/laravel-backup": "^8.0",
65+
"spatie/laravel-ignition": "^2.0",
6766
"tecnickcom/tc-lib-barcode": "^1.15",
6867
"tecnickcom/tcpdf": "^6.5",
6968
"unicodeveloper/laravel-password": "^1.0",

composer.lock

Lines changed: 62 additions & 113 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)