summary refs log tree commit diff
path: root/tests/federation/test_federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 10:19:36 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 10:20:43 +0000
commit8c83cc471bb65494dd62aeb6055f64088ac99bdd (patch)
tree853fc05aaa43539404f957e69f41c3499f604cc6 /tests/federation/test_federation.py
parentMerge pull request #60 from matrix-org/single_source_version_and_dependencies (diff)
parentMerge pull request #59 from matrix-org/hotfixes-v0.6.1f (diff)
downloadsynapse-8c83cc471bb65494dd62aeb6055f64088ac99bdd.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests/federation/test_federation.py')
0 files changed, 0 insertions, 0 deletions