diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:55:06 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:55:06 +0000 |
commit | 4f37c0ea9dd99b76258d07059e5f2dc6549f3f95 (patch) | |
tree | 3130a9b275d0f77c04118d54334ca3d4a9b7d71d /synapse/federation/transport.py | |
parent | update media repository implementation docs (diff) | |
parent | oops (diff) | |
download | synapse-4f37c0ea9dd99b76258d07059e5f2dc6549f3f95.tar.xz |
Merge branch 'develop' into media_repository
Diffstat (limited to 'synapse/federation/transport.py')
-rw-r--r-- | synapse/federation/transport.py | 2 |
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) |