Merge branch 'trunk'

Merge branch 'develop' into trunk
bump composer
2022-12-12 13:26:00 +01:00 · 2022-12-12 13:24:05 +01:00 · 2022-12-12 13:22:06 +01:00 · 2022-12-12 13:21:44 +01:00 · 2022-10-27 09:13:24 +02:00 · 2022-10-27 09:13:19 +02:00
2 changed files with 515 additions and 715 deletions
--- a/composer.lock
+++ b/composer.lock
--- a/config/cors.php
+++ b/config/cors.php
@ -19,9 +19,7 @@ return [

    'allowed_methods' => ['*'],

-    'allowed_origins' => ['
-        http://portsalaries.test
-    '],
+    'allowed_origins' => ['*'],

    'allowed_origins_patterns' => [],
Author	SHA1	Message	Date
Jérémy Munsch	c66cdbb8b5	Merge branch 'trunk'	2022-12-12 13:26:00 +01:00
Jérémy Munsch	858d5f1e4c	Merge branch 'develop' into trunk	2022-12-12 13:24:05 +01:00
Jérémy Munsch	8e4b9e2014	bump composer	2022-12-12 13:22:06 +01:00
Jérémy Munsch	9f5159c964	fix Cors	2022-12-12 13:21:44 +01:00
Jérémy Munsch	b374f957da	Merge branch 'hotfix' into develop	2022-10-27 09:13:24 +02:00
Jérémy Munsch	ee16395d6c	Merge branch 'hotfix'	2022-10-27 09:13:19 +02:00