diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 17:21:34 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 17:21:34 +0100 |
| commit | 5e785d4d5b4137dfa596fde99c80ff94faff0a71 (patch) | |
| tree | daa6637c3c7db3b8f0fe1957f7719ffabb04e026 /synapse/api/errors.py | |
| parent | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ... (diff) | |
| parent | Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics" (diff) | |
| download | synapse-5e785d4d5b4137dfa596fde99c80ff94faff0a71.tar.xz | |
Merge branch 'develop' of https://github.com/matrix-org/synapse into release-v0.27.0
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__) |