Update telephony-web image to v20260324d, resolve merge conflicts

apps/gitea-public/gitea-public.yaml

@@ -1,20 +1,20 @@
-# Gitea Public IngressRoute
-# Routes gitea.flowercore.io to internal Gitea service via Cloudflare origin cert
-# ArgoCD managed - BlueJay Lab
----
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: gitea-public
-  namespace: gitea
-spec:
-  entryPoints:
-    - websecure
-  routes:
-    - match: Host(`gitea.flowercore.io`)
-      kind: Rule
-      services:
-        - name: gitea-http
-          port: 3000
-  tls:
-    secretName: cf-origin-flowercore-io
+# Gitea Public IngressRoute
+# Routes gitea.flowercore.io to internal Gitea service via Cloudflare origin cert
+# ArgoCD managed - BlueJay Lab
+---
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: gitea-public
+  namespace: gitea
+spec:
+  entryPoints:
+    - websecure
+  routes:
+    - match: Host(`gitea.flowercore.io`)
+      kind: Rule
+      services:
+        - name: gitea-http
+          port: 3000
+  tls:
+    secretName: cf-origin-flowercore-io