summary refs log tree commit diff
path: root/synapse/storage/end_to_end_keys.py
diff options
context:
space:
mode:
authorhera <matrix@template.upcloud.com>2018-06-28 21:09:28 +0000
committerhera <matrix@template.upcloud.com>2018-06-28 21:09:28 +0000
commit82781f5838c4fd152fe2698bc6a757ff3a200dbb (patch)
treed4f779c1189f1367a2809d9f4aeb61e2f9998243 /synapse/storage/end_to_end_keys.py
parentMerge remote-tracking branch 'origin/revert-3451-hawkowl/sorteddict-api' into... (diff)
parentMerge pull request #3465 from matrix-org/matthew/as_ip_lock (diff)
downloadsynapse-82781f5838c4fd152fe2698bc6a757ff3a200dbb.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/end_to_end_keys.py')
-rw-r--r--synapse/storage/end_to_end_keys.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py

index b146487943..181047c8b7 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py
@@ -16,8 +16,7 @@ from twisted.internet import defer from synapse.util.caches.descriptors import cached -from canonicaljson import encode_canonical_json -import simplejson as json +from canonicaljson import encode_canonical_json, json from ._base import SQLBaseStore