diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
commit | 66a4d3352447f170afcddd1270c1a743273d19e6 (patch) | |
tree | 49ee0260dd816d6f7c640f742c4895c6b5cb10fb /tests/federation/test_federation.py | |
parent | Merge branch 'develop' into storage_transactions (diff) | |
parent | Merge branch 'client_server_url_rename' into develop (diff) | |
download | synapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'tests/federation/test_federation.py')
0 files changed, 0 insertions, 0 deletions