summary refs log tree commit diff
path: root/synapse/util/frozenutils.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/util/frozenutils.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/util/frozenutils.py')
-rw-r--r--synapse/util/frozenutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py

index 15f0a7ba9e..535e7d0e7a 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py
@@ -14,7 +14,7 @@ # limitations under the License. from frozendict import frozendict -import simplejson as json +from canonicaljson import json from six import string_types