diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-15 23:38:43 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-03-15 23:40:23 +0000 |
| commit | 6783bc0ded35322639e613abf7d33ebbccdb9404 (patch) | |
| tree | ead2d719093fd64a979f74c7f168054ddf34080d /synapse/storage | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
| download | synapse-6783bc0ded35322639e613abf7d33ebbccdb9404.tar.xz | |
Replace some ujson with simplejson to make it work
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 8392e13b52..4c94338368 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -38,7 +38,7 @@ from functools import wraps import synapse.metrics import logging -import ujson as json +import simplejson as json # these are only included to make the type annotations work from synapse.events import EventBase # noqa: F401 |