summary refs log tree commit diff
path: root/synapse/federation/persistence.py
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/persistence.py
parentMention new libs in CHANGES (diff)
downloadsynapse-4ebbaf0d4382813ba896f3e8101de12e112cbed5.tar.xz
Blunty replace json with simplejson
Diffstat (limited to 'synapse/federation/persistence.py')
-rw-r--r--synapse/federation/persistence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index 85c82a4623..8a1afc0ca5 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -23,7 +23,7 @@ from twisted.internet import defer
 
 from synapse.util.logutils import log_function
 
-import json
+import simplejson as json
 import logging