diff options
| author | David Baker <dave@matrix.org> | 2018-07-17 15:43:33 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-07-17 15:43:33 +0100 |
| commit | 1d11d9323d1d5eb419cbced9417f58d155c68255 (patch) | |
| tree | 7b35de324a19d67f7fab5e6bc9c637c9c2253a71 /synapse/storage/search.py | |
| parent | Merge pull request #3502 from matrix-org/matthew/dinsic-tweak-display-names (diff) | |
| parent | changelog (diff) | |
| download | synapse-1d11d9323d1d5eb419cbced9417f58d155c68255.tar.xz | |
Merge remote-tracking branch 'origin/master' into dinsic
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 f0fa5d7631..9b77c45318 100644 --- a/synapse/storage/search.py +++ b/synapse/storage/search.py @@ -16,7 +16,7 @@ from collections import namedtuple import logging import re -import simplejson as json +from canonicaljson import json from six import string_types |