Merge remote-tracking branch 'origin/main' into livekit

2025-01-26 20:36:40 +00:00
parent 2f7294705e 71e7fe3086
commit 9de87a01ab
227 changed files with 16549 additions and 2943 deletions
--- a/crates/delta/src/routes/root.rs
+++ b/crates/delta/src/routes/root.rs
@@ -111,7 +111,7 @@ pub async fn root() -> Result<Json<RevoltConfig>> {
        },
        ws: config.hosts.events,
        app: config.hosts.app,
-        vapid: config.api.vapid.public_key,
+        vapid: config.pushd.vapid.public_key,
        build: BuildInformation {
            commit_sha: option_env!("VERGEN_GIT_SHA")
                .unwrap_or_else(|| "<failed to generate>")