diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-09-14 11:02:37 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-09-14 11:02:37 +0100 |
commit | 003c2ab629ac23e5a789b8152f45f999a21dcfb2 (patch) | |
tree | 389f4e154384a4aea61aff018c0027f89b5179d0 /synapse/handlers/federation_event.py | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
parent | Use direct references for some configuration variables (#10798) (diff) | |
download | synapse-003c2ab629ac23e5a789b8152f45f999a21dcfb2.tar.xz |
Merge branch 'release-v1.43' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/federation_event.py')
-rw-r--r-- | synapse/handlers/federation_event.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py |