summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-04-03 16:23:23 +0100
committerRichard van der Hoff <richard@matrix.org>2017-04-03 16:23:23 +0100
commit2d05eb3cf580753ba643410225e883e4d83ecf23 (patch)
tree1c466950d045657c5440da3fa796e7849a3a29b6 /setup.cfg
parentMerge branch 'release-v0.20.0' of github.com:matrix-org/synapse into develop (diff)
parentMerge pull request #2094 from matrix-org/rav/fix_federation_join (diff)
downloadsynapse-2d05eb3cf580753ba643410225e883e4d83ecf23.tar.xz
Merge remote-tracking branch 'origin/release-v0.20.0' into develop
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions