diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-05-03 14:59:29 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-05-03 14:59:29 +0100 |
| commit | 093d8c415a303fa7c8900e3fe685843b60a85eed (patch) | |
| tree | 8dd5ceabb4c8ecbae18fa95f10108ba335c6bbbf /synapse/storage/receipts.py | |
| parent | Make 'unexpected logging context' into warnings (diff) | |
| parent | Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks (diff) | |
| download | synapse-093d8c415a303fa7c8900e3fe685843b60a85eed.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail
Diffstat (limited to 'synapse/storage/receipts.py')
| -rw-r--r-- | synapse/storage/receipts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py index eac8694e0f..63997ed449 100644 --- a/synapse/storage/receipts.py +++ b/synapse/storage/receipts.py @@ -23,7 +23,7 @@ from twisted.internet import defer import abc import logging -import ujson as json +import simplejson as json logger = logging.getLogger(__name__) |