Skip to content

A free open source IT asset/license management system

Merge branch 'develop' into use_new_laravel_scim_server

Brady Wetherington53149666ad6a
diff --cc composer.lock
index af1dcd1ec1,0912604589..0483f08fde
--- a/composer.lock
+++ b/composer.lock
@@@ -94,10 -95,10 +95,11 @@@
"tmilos/scim-schema": "^0.1.0"
},
"require-dev": {
+ "friendsofphp/php-cs-fixer": "^3.66",
"laravel/legacy-factories": "*",
- "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0"
+ "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0|^10.0"
},
+ "default-branch": true,
"type": "library",
"extra": {
"laravel": {