Merge branch 'master' into master

alromh87 · Sep 12, 2020 · 098e345 · 098e345
2 parents a80858d + 742aef7
commit 098e345
Show file tree

Hide file tree

Showing 4 changed files with 152 additions and 128 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "ext-imagick": "*",
         "ext-intl": "*",
         "ext-redis": "*",
-        "asbiin/laravel-webauthn": "^0.8",
+        "asbiin/laravel-webauthn": "^0.9",
         "bacon/bacon-qr-code": "^2.0",
         "creativeorange/gravatar": "~1.0",
         "doctrine/dbal": "2.9.3",
@@ -25,7 +25,7 @@
         "laravel/cashier": "~10.0",
         "laravel/framework": "^7.0",
         "laravel/passport": "^9.0",
-        "laravel/socialite": "^4.0",
+        "laravel/socialite": "^5.0",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^2.0",
         "laravolt/avatar": "^3.0",