summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-11-26 10:53:48 +0000
committerGitHub <noreply@github.com>2019-11-26 10:53:48 +0000
commit4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch)
treefcaea2671bf38721520191c13bb37adf18ef84c5 /synapse/federation/transport/server.py
parentFormat changelog (diff)
parentMake sure that we close cursors before returning from a query (#6408) (diff)
downloadsynapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz
Merge branch 'develop' into babolivier/context_filters
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