Merge remote-tracking branch 'origin/#10-regulations-for-escooters' i…

…nto #10-regulations-for-escooters # Conflicts: # composer.json # composer.lock # lang/pl.json # routes/api.php
e-motion-apps · May 8, 2024 · 73b8515 · 73b8515
2 parents 8ed2d61 + 280b621
commit 73b8515
Show file tree

Hide file tree

Showing 3 changed files with 520 additions and 395 deletions.
diff --git a/composer.json b/composer.json
@@ -10,9 +10,10 @@
         "ext-gd": "*",
         "ext-pdo": "*",
         "guzzlehttp/guzzle": "^7.7",
-        "intervention/image": "2.*",
         "dedoc/scramble": "^0.9.0",
         "inertiajs/inertia-laravel": "^1.0.0",
+        "intervention/image": "2.*",
+
         "laravel/framework": "^10.13.0",
         "laravel/sanctum": "^3.2.5",
         "laravel/socialite": "^5.10",