diff options
| author | Krombel <krombel@krombel.de> | 2018-03-28 14:45:28 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2018-03-28 14:45:28 +0200 |
| commit | 6152e253d842eb4f72be975850450f00c0662e43 (patch) | |
| tree | 5fa7c6cef720825e05076190c7d0e1f45565a4b5 /synapse/storage/room.py | |
| parent | move handling of auto_join_rooms to RegisterHandler (diff) | |
| parent | Merge pull request #3042 from matrix-org/fix_locally_failing_tests (diff) | |
| download | synapse-6152e253d842eb4f72be975850450f00c0662e43.tar.xz | |
Merge branch 'develop' of into allow_auto_join_rooms
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 34ed84ea22..908551d6d9 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -22,7 +22,7 @@ from synapse.util.caches.descriptors import cached, cachedInlineCallbacks import collections import logging -import ujson as json +import simplejson as json import re logger = logging.getLogger(__name__) |