diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
commit | 9970f955ce1ab36d21f7824d9f1382ab1df778e5 (patch) | |
tree | 94f824e633ac9b9fab18171a67a6b94aec2839a9 /synapse/federation/federation_base.py | |
parent | Newsfile (diff) | |
parent | Fix races in room stats (and other) updates. (#6187) (diff) | |
download | synapse-9970f955ce1ab36d21f7824d9f1382ab1df778e5.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner
Diffstat (limited to 'synapse/federation/federation_base.py')
0 files changed, 0 insertions, 0 deletions