Merge branch dev into features/notifications

2026-03-19 09:56:35 +01:00
parent 922b4df8b5 ad6a0f6e90
commit 75d80985ff
30 changed files with 1012 additions and 80 deletions
@@ -20,9 +20,13 @@ return [

    'allowed_methods' => ['*'],

+<<<<<<< HEAD
    'allowed_origins' => env('DEV', 0) == 1
        ? explode(',', env('DEV_CORS_ALLOWED_ORIGINS'))
        : explode(',', env('PROD_CORS_ALLOWED_ORIGINS')),
+=======
+    'allowed_origins' => ['*'],
+>>>>>>> dev

    'allowed_origins_patterns' => [],