Skip to content

A free open source IT asset/license management system

Merge branch 'develop' into use_new_laravel_scim_server

Brady Wetheringtonbeaea6c3bf59
diff --cc composer.lock
index 6be8a1ee9e,c120fa2e6d..6b45de4bb1
--- 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": "010e4f225586a6b3e7bc98f2f71cc0c6",
- "content-hash": "67212462613747ee572922f09d81f562",
"packages": [
{
"name": "alek13/slack",