summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-09 15:02:21 +0100
committerGitHub <noreply@github.com>2019-05-09 15:02:21 +0100
commit38e3d9ed672c90138a7713ddd41170aac3755fd8 (patch)
treeab16e40ceab5425150495b5903972ea4a488e96f /synapse/config/server.py
parentMerge pull request #5098 from matrix-org/rav/fix_pep_517 (diff)
parentFix failing test (diff)
downloadsynapse-38e3d9ed672c90138a7713ddd41170aac3755fd8.tar.xz
Merge pull request #5115 from matrix-org/babolivier/lookup_path dinsic_2019-05-09
[DINSIC] Move 3PID lookup endpoint to CS API and proxy bulk lookups
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index ac44b17a09..c5e5679d52 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -573,7 +573,6 @@ KNOWN_RESOURCES = ( 'replication', 'static', 'webclient', - 'identity', )