From bbd88b9114be8542f990b33c0a97579c5d01898b Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+github@mailbox.org>
Date: Mon, 19 Aug 2024 14:10:35 +0200
Subject: [PATCH] Add changelog

---
 changelogs/client_server/newsfragments/1933.deprecation | 1 +
 changelogs/client_server/newsfragments/1933.feature     | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelogs/client_server/newsfragments/1933.deprecation
 create mode 100644 changelogs/client_server/newsfragments/1933.feature

diff --git a/changelogs/client_server/newsfragments/1933.deprecation b/changelogs/client_server/newsfragments/1933.deprecation
new file mode 100644
index 00000000..745a23ab
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1933.deprecation
@@ -0,0 +1 @@
+Deprecate the `server_name` query parameter on `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}` as per MSC4156.
diff --git a/changelogs/client_server/newsfragments/1933.feature b/changelogs/client_server/newsfragments/1933.feature
new file mode 100644
index 00000000..27a29a3e
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1933.feature
@@ -0,0 +1 @@
+Add `via` query parameter on `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}` as per MSC4156.