From 625913d797cda10d9916934351e598161adaced0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Jul 2018 15:53:43 -0600
Subject: [PATCH] Add to changelog

---
 changelogs/client_server.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index feabecab..01670c74 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -15,6 +15,8 @@ Unreleased changes
   - Sticker messages:
     - Add sticker message event definition.
     (`#1158 <https://github.com/matrix-org/matrix-doc/pull/1158>`_).
+  - Document the ``server_name`` parameter on ``/join/{roomIdOrAlias}``
+    (`#1364 <https://github.com/matrix-org/matrix-doc/pull/1364>`_).
 
 - Spec clarifications: