summary refs log tree commit diff
path: root/synapse/handlers/user_directory.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-02-15 17:51:34 +0000
committerGitHub <noreply@github.com>2019-02-15 17:51:34 +0000
commit5bd2e2c31dbfed2e69800ee72aef80f7e4bda210 (patch)
treeccf42d76febff8e4cb16a2eb04591db95910f866 /synapse/handlers/user_directory.py
parentMerge remote-tracking branch 'origin/release-v0.99.1' into matrix-org-hotfixes (diff)
parentcleanup (diff)
downloadsynapse-5bd2e2c31dbfed2e69800ee72aef80f7e4bda210.tar.xz
Merge pull request #4654 from matrix-org/hawkowl/registration-worker
Registration worker
Diffstat (limited to 'synapse/handlers/user_directory.py')
-rw-r--r--synapse/handlers/user_directory.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py

index f5c3ba23a6..0dacd9e357 100644 --- a/synapse/handlers/user_directory.py +++ b/synapse/handlers/user_directory.py
@@ -14,7 +14,6 @@ # limitations under the License. import logging -import synapse.metrics from six import iteritems