summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-27 17:22:35 +0000
committerErik Johnston <erik@matrix.org>2016-01-27 17:22:35 +0000
commita955cbfa494be705a0f2eb1d2fb5cd3b8c481b6f (patch)
tree1ef745f393f8c1961da93ad6ad582829e9f1ea5b /tests
parentPEP 8 (diff)
parentMerge pull request #533 from matrix-org/rav/hashtest_federation (diff)
downloadsynapse-a955cbfa494be705a0f2eb1d2fb5cd3b8c481b6f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions