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>2020-12-02 20:08:46 +0000
committerRichard van der Hoff <richard@matrix.org>2020-12-02 20:08:46 +0000
commit269ba1bc847b1df27e5ebba3d8cd1954a57561e4 (patch)
tree6a57f03750897cf5b97d8188e497f54ce104581c /synapse/federation/transport/server.py
parentchangelog (diff)
parentMerge pull request #8858 from matrix-org/rav/sso_uia (diff)
downloadsynapse-269ba1bc847b1df27e5ebba3d8cd1954a57561e4.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/remove_unused_mocks
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 b53e7a20ec..434718ddfc 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -1462,7 +1462,7 @@ def register_servlets(hs, resource, authenticator, ratelimiter, servlet_groups=N
 
     Args:
         hs (synapse.server.HomeServer): homeserver
-        resource (TransportLayerServer): resource class to register to
+        resource (JsonResource): resource class to register to
         authenticator (Authenticator): authenticator to use
         ratelimiter (util.ratelimitutils.FederationRateLimiter): ratelimiter to use
         servlet_groups (list[str], optional): List of servlet groups to register.