summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-23 13:18:12 +0100
committerErik Johnston <erik@matrix.org>2017-10-23 13:18:12 +0100
commit1de557975f126b96dc65db0a12544c34429632dd (patch)
tree42b73375a5136e34c1cb52be578aa113b2589673 /synapse/federation
parentMerge pull request #2560 from matrix-org/rav/kill_pointless_method (diff)
parentMerge branch 'release-v0.24.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-1de557975f126b96dc65db0a12544c34429632dd.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions