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

index da05ccb027..b77402d295 100644 --- a/synapse/storage/group_server.py +++ b/synapse/storage/group_server.py
@@ -20,7 +20,7 @@ from synapse.api.errors import SynapseError from ._base import SQLBaseStore -import simplejson as json +from canonicaljson import json # The category ID for the "default" category. We don't store as null in the