diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
| commit | 89dda613153c4869f3c9ce96f5cbc47f93f54723 (patch) | |
| tree | 320e718965e5e843fe3950bd8c19cf4b9ad367a6 /synapse/storage/group_server.py | |
| parent | 0.27.3 (diff) | |
| parent | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id (diff) | |
| download | synapse-89dda613153c4869f3c9ce96f5cbc47f93f54723.tar.xz | |
Merge branch 'develop' into release-v0.27.0
Diffstat (limited to 'synapse/storage/group_server.py')
| -rw-r--r-- | synapse/storage/group_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py index 8fde1aab8e..d03858234b 100644 --- a/synapse/storage/group_server.py +++ b/synapse/storage/group_server.py @@ -19,7 +19,7 @@ from synapse.api.errors import SynapseError from ._base import SQLBaseStore -import ujson as json +import simplejson as json # The category ID for the "default" category. We don't store as null in the |