summary refs log tree commit diff
path: root/synapse/storage/end_to_end_keys.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
committerErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
commitf609acc109af5b981c5662932392b60fa44ec5f0 (patch)
tree12041428a201b66a7c71569b8a8f1a855b9db032 /synapse/storage/end_to_end_keys.py
parentMerge pull request #2798 from jeremycline/fedora-repo (diff)
parentNewline (diff)
downloadsynapse-0.26.1.tar.xz
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1
Diffstat (limited to 'synapse/storage/end_to_end_keys.py')
-rw-r--r--synapse/storage/end_to_end_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py

index 2cebb203c6..ff8538ddf8 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py
@@ -17,7 +17,7 @@ from twisted.internet import defer from synapse.util.caches.descriptors import cached from canonicaljson import encode_canonical_json -import ujson as json +import simplejson as json from ._base import SQLBaseStore