diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-10-04 14:17:05 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-10-04 14:17:05 +0100 |
commit | ebbd37b66db2c5ed700d50dd00e3e108d7f1268c (patch) | |
tree | 235bd75367c221a98d10c03eb86d63173e875bb2 /synapse/federation/federation_server.py | |
parent | Merge branch 'release-v1.44' into matrix-org-hotfixes (diff) | |
parent | Fix error in `get_user_ip_and_agents` when fetching from the database (#10968) (diff) | |
download | synapse-ebbd37b66db2c5ed700d50dd00e3e108d7f1268c.tar.xz |
Merge branch 'release-v1.44' into matrix-org-hotfixes
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r-- | synapse/federation/federation_server.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py |