summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-11-18 12:05:36 +0000
committerRichard van der Hoff <richard@matrix.org>2019-11-18 12:05:36 +0000
commit870c00e278a8156cf67f8c916c39215ef2333b56 (patch)
tree6a3fb77c7d8b1c2f9d919e1aa3b91de8a61567ab /synapse/federation/transport/server.py
parentnewsfile (diff)
parentReplace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff)
downloadsynapse-870c00e278a8156cf67f8c916c39215ef2333b56.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/event_auth/4
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r--synapse/federation/transport/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index d6c23f22bd..09baa9c57d 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -714,7 +714,7 @@ class PublicRoomList(BaseFederationServlet):
 
     This API returns information in the same format as /publicRooms on the
     client API, but will only ever include local public rooms and hence is
-    intended for consumption by other home servers.
+    intended for consumption by other homeservers.
 
     GET /publicRooms HTTP/1.1