A free open source IT asset/license management system
Merge remote-tracking branch 'upstream/develop' into codacy-oidc-cleanup
Rod Christiansenefb52c2440e7
diff --cc composer.jsonindex 3c9907c024,55dadd4544..4a878a11d0--- a/composer.json+++ b/composer.json@@@ -35,8 -35,8 +35,9 @@@"enshrined/svg-sanitize": "^0.22.0","erusev/parsedown": "^1.7","fakerphp/faker": "^1.24",+ "firebase/php-jwt": "^6.4|^7.0","guzzlehttp/guzzle": "^7.0.1",+ "innoge/laravel-msgraph-mail": "^2.0","intervention/image": "^2.5","javiereguiluz/easyslugger": "^1.0","laravel-notification-channels/google-chat": "^3.0",diff --cc composer.lockindex 6f040e85b5,33f76a7b65..2a353997dd--- a/composer.lock+++ b/composer.lock@@@ -4,7 -4,7 +4,7 @@@"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies","This file is @generated automatically"],- "content-hash": "73f69434daa9a555f368b9656492120d",- "content-hash": "c8bdf87ea83fe7b377b242068241002f",++ "content-hash": "d350c2b6f80ba4e6859b3f8619ee4c86","packages": [{"name": "alek13/slack",