Merge remote-tracking branch 'origin/main'

# Conflicts: # admin/src/app/app.html # admin/src/app/app.ts
2025-11-14 08:27:15 +01:00
parent cbede30d65 19ca0c086c
commit 5ab072992b
21 changed files with 283 additions and 20 deletions
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
  "version": "0.0.0",
  "scripts": {
    "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --proxy-config proxy.conf.json",
    "build": "ng build",
    "watch": "ng build --watch --configuration development",
    "test": "ng test"