Merge branch 'master' into feat/android-app-redesign

2026-06-09 16:41:23 -04:00
parent b613e43ab3 07abd1f7a9
commit 1241d50a4a
2 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .env
-/ vendor/
+/vendor/
 .idea/
 logs/
 *.log
--- a/src/Controllers/ApiController.php
+++ b/src/Controllers/ApiController.php
@@ -306,6 +306,7 @@ class ApiController
        ]);
    }

+<<<<<<< HEAD
    public function register(): void
    {
        $input = json_decode(file_get_contents('php://input'), true) ?? $_POST;