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

This commit is contained in:
2026-06-09 16:41:23 -04:00
2 changed files with 2 additions and 1 deletions

2
.gitignore vendored
View File

@@ -1,5 +1,5 @@
.env .env
/ vendor/ /vendor/
.idea/ .idea/
logs/ logs/
*.log *.log

View File

@@ -306,6 +306,7 @@ class ApiController
]); ]);
} }
<<<<<<< HEAD
public function register(): void public function register(): void
{ {
$input = json_decode(file_get_contents('php://input'), true) ?? $_POST; $input = json_decode(file_get_contents('php://input'), true) ?? $_POST;