merge dev into features/notifications

2026-03-19 10:00:18 +01:00
parent 75d80985ff
commit 0e5d6a1270
1 changed files with 0 additions and 4 deletions
@@ -20,13 +20,9 @@ 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' => [],