diff options
author | Erik Johnston <erik@matrix.org> | 2021-07-29 16:29:17 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-07-29 16:29:17 +0100 |
commit | 65f520697da2df74afac24c4beb08eddba8342b3 (patch) | |
tree | 34c0df9e866f85271fc33ce4710c83f76d6b2f73 /synapse/app/__init__.py | |
parent | Improve failover logic for MSC3083 restricted rooms. (#10447) (diff) | |
parent | Merge tag 'v1.39.0' (diff) | |
download | synapse-65f520697da2df74afac24c4beb08eddba8342b3.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/app/__init__.py')
0 files changed, 0 insertions, 0 deletions