diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 17:10:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 17:10:22 +0000 |
| commit | 54fdbc7e50dfdd80eda563536d08bdfef079937c (patch) | |
| tree | 9d28877f14b914af743629010be54a01477ffddc /synapse/federation/transport/server.py | |
| parent | Allow newer versions of syutil (diff) | |
| parent | Bump syutil version (diff) | |
| download | synapse-54fdbc7e50dfdd80eda563536d08bdfef079937c.tar.xz | |
Merge pull request #66 from matrix-org/use-simplejson
Use simplejson
Diffstat (limited to 'synapse/federation/transport/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 9c9f8d525b..2ffb37aa18 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -20,7 +20,7 @@ from synapse.api.errors import Codes, SynapseError from synapse.util.logutils import log_function import logging -import json +import simplejson as json import re |