diff options
author | Richard van der Hoff <richard@matrix.org> | 2017-04-03 16:23:23 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2017-04-03 16:23:23 +0100 |
commit | 2d05eb3cf580753ba643410225e883e4d83ecf23 (patch) | |
tree | 1c466950d045657c5440da3fa796e7849a3a29b6 /setup.cfg | |
parent | Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse into develop (diff) | |
parent | Merge pull request #2094 from matrix-org/rav/fix_federation_join (diff) | |
download | synapse-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