summary refs log tree commit diff
path: root/scripts-dev/federation_client.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
committerErik Johnston <erik@matrix.org>2016-08-08 11:24:53 +0100
commit34101427417f58418a9587adfeca3d41898b5e24 (patch)
treef1cb2f39d3838b1dcf709c3f3921dbe82afdd3a5 /scripts-dev/federation_client.py
parentUpdate changelog (diff)
parentMerge pull request #992 from matrix-org/erikj/psutil_conditional (diff)
downloadsynapse-34101427417f58418a9587adfeca3d41898b5e24.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.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py

index 59c3dce3d7..d1ab42d3af 100644 --- a/scripts-dev/federation_client.py +++ b/scripts-dev/federation_client.py
@@ -143,6 +143,7 @@ def main(): ) json.dump(result, sys.stdout) + print "" if __name__ == "__main__": main()