diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-16 00:13:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-16 00:13:51 +0000 |
| commit | f609acc109af5b981c5662932392b60fa44ec5f0 (patch) | |
| tree | 12041428a201b66a7c71569b8a8f1a855b9db032 /synapse/rest/client | |
| parent | Merge pull request #2798 from jeremycline/fedora-repo (diff) | |
| parent | Newline (diff) | |
| download | synapse-f609acc109af5b981c5662932392b60fa44ec5f0.tar.xz | |
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 75b735b47d..80989731fa 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -29,7 +29,7 @@ from synapse.http.servlet import ( import logging import urllib -import ujson as json +import simplejson as json logger = logging.getLogger(__name__) diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index a0a8e4b8e4..eb91c0b293 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -33,7 +33,7 @@ from ._base import set_timeline_upper_limit import itertools import logging -import ujson as json +import simplejson as json logger = logging.getLogger(__name__) |