Merge branch 'develop' into 5.8-dev

# Conflicts: # composer.lock
2026-01-08 15:05:29 +00:00 · 2022-08-03 05:40:31 +02:00
parent 39a928d7f4 aa3fba91d4
commit 4d1b21f70d
68 changed files with 572 additions and 646 deletions
--- a/composer.json
+++ b/composer.json
@@ -91,7 +91,7 @@
    "laravel/framework": "^9",
    "laravel/passport": "10.*",
    "laravel/sanctum": "^2.14",
-    "laravel/ui": "^3.4",
+    "laravel/ui": "^4.0",
    "laravelcollective/html": "6.*",
    "league/commonmark": "2.*",
    "league/csv": "^9.7",