summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 17:25:16 +0100
committerErik Johnston <erik@matrix.org>2019-06-11 17:25:16 +0100
commit7e68691ce947cac0a470d8b8df3332958686ccc1 (patch)
tree75987c8c6556edf9d14dd5878c1c63a5fae2e5fb /synapse/federation
parentMerge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop (diff)
parent1.0.0 (diff)
downloadsynapse-7e68691ce947cac0a470d8b8df3332958686ccc1.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