diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
commit | 870c00e278a8156cf67f8c916c39215ef2333b56 (patch) | |
tree | 6a3fb77c7d8b1c2f9d919e1aa3b91de8a61567ab /synapse/http/matrixfederationclient.py | |
parent | newsfile (diff) | |
parent | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff) | |
download | synapse-870c00e278a8156cf67f8c916c39215ef2333b56.tar.xz |
Merge remote-tracking branch 'origin/develop' into rav/event_auth/4
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r-- | synapse/http/matrixfederationclient.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 691380abda..16765d54e0 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -530,7 +530,7 @@ class MatrixFederationHttpClient(object): """ Builds the Authorization headers for a federation request Args: - destination (bytes|None): The desination home server of the request. + destination (bytes|None): The desination homeserver of the request. May be None if the destination is an identity server, in which case destination_is must be non-None. method (bytes): The HTTP method of the request |