Skip to content

A free open source IT asset/license management system

Merge branch 'develop' into use_new_laravel_scim_server

Brady Wetherington0f45ecc00fcf
diff --cc composer.json
index 0a33a3b0df,76a59a22f2..c2da3eb453
--- a/composer.json
+++ b/composer.json
@@@ -29,10 -29,9 +29,9 @@@
"ext-mbstring": "*",
"ext-pdo": "*",
"alek13/slack": "^2.0",
- "arietimmerman/laravel-scim-server": "dev-laravel_11_compatibility",
+ "arietimmerman/laravel-scim-server": "dev-upstream_master",
"bacon/bacon-qr-code": "^2.0",
"barryvdh/laravel-debugbar": "^3.13",
- "barryvdh/laravel-dompdf": "^2.0",
"doctrine/cache": "^1.10",
"doctrine/dbal": "^3.1",
"doctrine/instantiator": "^1.3",
diff --cc composer.lock
index 9069fb0317,6ea5fd2679..af1dcd1ec1
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,6 @@@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "1086d1b9a8b59a62d87c4e74a5babf89",
- "content-hash": "553ce69c21704905c568769de08fffe4",
"packages": [
{
"name": "alek13/slack",