summary refs log tree commit diff
path: root/synapse/http/site.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2024-07-31 12:59:11 +0100
committerErik Johnston <erik@matrix.org>2024-07-31 13:00:13 +0100
commit31ec7b547cb3d9ecbc291e1e9fed163873742340 (patch)
treecc4169aa48ad7df0188971045047bbcdd6420f31 /synapse/http/site.py
parentMerge branch 'erikj/ss_room_sub_timeline' into erikj/ss_hacks (diff)
parentSliding Sync: Update filters to be robust against remote invite rooms (#17450) (diff)
downloadsynapse-31ec7b547cb3d9ecbc291e1e9fed163873742340.tar.xz
Merge remote-tracking branch 'origin/develop' into erikj/ss_hacks
Diffstat (limited to 'synapse/http/site.py')
-rw-r--r--synapse/http/site.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py
index a5b5780679..af169ba51e 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -683,7 +683,7 @@ class SynapseSite(ProxySite):
         self.access_logger = logging.getLogger(logger_name)
         self.server_version_string = server_version_string.encode("ascii")
 
-    def log(self, request: SynapseRequest) -> None:
+    def log(self, request: SynapseRequest) -> None:  # type: ignore[override]
         pass