diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
| commit | 427e6c4059e2eff5eacf114dc6708e2972ca36d2 (patch) | |
| tree | 608df478fe94531db9a789e3c8d1e827a34d8302 /synapse/api/errors.py | |
| parent | Update README.rst (diff) | |
| parent | bump version/changelog (diff) | |
| download | synapse-427e6c4059e2eff5eacf114dc6708e2972ca36d2.tar.xz | |
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3
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__) |