summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-06 10:53:04 +0000
committerErik Johnston <erik@matrix.org>2015-01-06 10:53:04 +0000
commit96a5ba41f503982dfa8b7d669161ea43b0529189 (patch)
tree4ad40ec4cac09fd67b01cd10ce6f99e295953b72 /synapse/federation
parentMerge branch 'master' of github.com:matrix-org/synapse into erikj-perf (diff)
parentspell out that VoIP needs TURN (diff)
downloadsynapse-96a5ba41f503982dfa8b7d669161ea43b0529189.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions