diff options
| author | kaiyou <pierre@jaury.eu> | 2018-03-17 16:02:08 +0100 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-03-17 16:02:08 +0100 |
| commit | 757f1b58437f912e147f523ea55d45dfda8a8c1e (patch) | |
| tree | 034e210d3df7ef63c43ba0d5a35231ba398fedca /synapse/storage/room.py | |
| parent | Disable logging to file and rely on the console when using Docker (diff) | |
| parent | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff) | |
| download | synapse-757f1b58437f912e147f523ea55d45dfda8a8c1e.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 23688430b7..2051d8506d 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -23,7 +23,7 @@ from .engines import PostgresEngine, Sqlite3Engine import collections import logging -import ujson as json +import simplejson as json import re logger = logging.getLogger(__name__) |