diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-04-04 08:46:56 -0600 |
| commit | 88964b987e1d80d2dc9e81fc3ebc51afd9defbe1 (patch) | |
| tree | c98c28e51a8d52a8878cf2d888a4a110a835d8a8 /synapse/storage/search.py | |
| parent | Document the additional routes for the event_creator worker (diff) | |
| parent | Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-check (diff) | |
| download | synapse-88964b987e1d80d2dc9e81fc3ebc51afd9defbe1.tar.xz | |
Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs
Diffstat (limited to 'synapse/storage/search.py')
| -rw-r--r-- | synapse/storage/search.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/search.py b/synapse/storage/search.py index 2755acff40..984643b057 100644 --- a/synapse/storage/search.py +++ b/synapse/storage/search.py @@ -16,7 +16,7 @@ from collections import namedtuple import logging import re -import ujson as json +import simplejson as json from twisted.internet import defer |