summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 17:08:54 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 17:08:54 +0000
commit0c897c7410035c5b5df3d9c29759c4dde3592c0a (patch)
tree11759baa0d5a49dc69d2ac907690aaa5ee519cdd /synapse/server.py
parentMerge commit '8ca120df7' into anoa/dinsic_release_1_23_1 (diff)
parentStrip trailing / from server_url in register_new_matrix_user (#8823) (diff)
downloadsynapse-0c897c7410035c5b5df3d9c29759c4dde3592c0a.tar.xz
Merge commit '7c4344747' into anoa/dinsic_release_1_23_1
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 12a783de17..c82d8f9fad 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -27,7 +27,8 @@ import logging import os from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, TypeVar, cast -import twisted +import twisted.internet.base +import twisted.internet.tcp from twisted.mail.smtp import sendmail from twisted.web.iweb import IPolicyForHTTPS