Merge branch 'stablecrosssigning' into 'next'

fix: cross signing is stable See merge request famedly/conduit!171
4 years ago · 4af2c4f2d0
1 changed files with 2 additions and 2 deletions
--- a/src/client_server/keys.rs
+++ b/src/client_server/keys.rs
@ -135,7 +135,7 @@ pub async fn claim_keys_route(
				@@ -135,7 +135,7 @@ pub async fn claim_keys_route(
 /// - Requires UIAA to verify password
 #[cfg_attr(
    feature = "conduit_bin",
-    post("/_matrix/client/unstable/keys/device_signing/upload", data = "<body>")
+    post("/_matrix/client/r0/keys/device_signing/upload", data = "<body>")
 )]
 #[tracing::instrument(skip(db, body))]
 pub async fn upload_signing_keys_route(
@ -199,7 +199,7 @@ pub async fn upload_signing_keys_route(
				@@ -199,7 +199,7 @@ pub async fn upload_signing_keys_route(
 /// Uploads end-to-end key signatures from the sender user.
 #[cfg_attr(
    feature = "conduit_bin",
-    post("/_matrix/client/unstable/keys/signatures/upload", data = "<body>")
+    post("/_matrix/client/r0/keys/signatures/upload", data = "<body>")
 )]
 #[tracing::instrument(skip(db, body))]
 pub async fn upload_signatures_route(