summary refs log tree commit diff
path: root/tests/federation
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 16:20:50 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 16:20:50 +0100
commit66a4d3352447f170afcddd1270c1a743273d19e6 (patch)
tree49ee0260dd816d6f7c640f742c4895c6b5cb10fb /tests/federation
parentMerge branch 'develop' into storage_transactions (diff)
parentMerge branch 'client_server_url_rename' into develop (diff)
downloadsynapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'tests/federation')
0 files changed, 0 insertions, 0 deletions