diff options
| author | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
| commit | 041b41a825e456db180a89a9e4df6ea9f3d01c5b (patch) | |
| tree | db669225768b3322fe4d63451fdd05799634599a /synapse/api/errors.py | |
| parent | Merge remote-tracking branch 'upstream/master' into feat-dockerfile (diff) | |
| parent | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff) | |
| download | synapse-041b41a825e456db180a89a9e4df6ea9f3d01c5b.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index aa15f73f36..bee59e80dd 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -15,9 +15,10 @@ """Contains exceptions and error codes.""" -import json import logging +import simplejson as json + logger = logging.getLogger(__name__) |