diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-24 14:51:35 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-24 14:51:35 +0000 |
commit | acaca1b4e97b062ab0f926794435b901b7a3fa4e (patch) | |
tree | 79c9381f3e82d0c4ded96485988adb6d9016a910 /synapse/federation/federation_server.py | |
parent | Fix missing synapse metrics import (diff) | |
parent | isort (diff) | |
download | synapse-acaca1b4e97b062ab0f926794435b901b7a3fa4e.tar.xz |
Merge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixes
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r-- | synapse/federation/federation_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py |