summary refs log tree commit diff
path: root/synapse/federation/transport.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-10 13:18:40 +0000
committerErik Johnston <erik@matrix.org>2014-12-10 13:18:40 +0000
commitaae8a37e63662681f6e75cca5b32cfba78b0d74f (patch)
tree10aa25caddf01da913d270186fc1169deff17320 /synapse/federation/transport.py
parentFix AttributeError (diff)
parentupdate codestyle based on debate on #matrix-dev (diff)
downloadsynapse-aae8a37e63662681f6e75cca5b32cfba78b0d74f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/federation/transport.py')
-rw-r--r--synapse/federation/transport.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport.py b/synapse/federation/transport.py

index 8d86152085..0f11c6d491 100644 --- a/synapse/federation/transport.py +++ b/synapse/federation/transport.py
@@ -155,7 +155,7 @@ class TransportLayer(object): @defer.inlineCallbacks @log_function def send_transaction(self, transaction, json_data_callback=None): - """ Sends the given Transaction to it's destination + """ Sends the given Transaction to its destination Args: transaction (Transaction)