diff options
author | Erik Johnston <erik@matrix.org> | 2016-08-02 17:07:54 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-08-02 17:07:54 +0100 |
commit | 59a2c6d60e3c1e03f86e88ad81ac093c8109942d (patch) | |
tree | ef5a7b0722f1d2890df706ac6f42d6dda5986645 /scripts-dev/federation_client.py | |
parent | Typo (diff) | |
parent | Merge pull request #971 from matrix-org/erikj/fed_state (diff) | |
download | synapse-59a2c6d60e3c1e03f86e88ad81ac093c8109942d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'scripts-dev/federation_client.py')
-rw-r--r-- | scripts-dev/federation_client.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py |