summary refs log tree commit diff
path: root/synapse/federation/transport
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 14:23:10 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 14:23:10 +0000
commit4ebbaf0d4382813ba896f3e8101de12e112cbed5 (patch)
tree179bf2e1a0d0330437518eff45788604ab2f4ad7 /synapse/federation/transport
parentMention new libs in CHANGES (diff)
downloadsynapse-4ebbaf0d4382813ba896f3e8101de12e112cbed5.tar.xz
Blunty replace json with simplejson
Diffstat (limited to 'synapse/federation/transport')
-rw-r--r--synapse/federation/transport/server.py2
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