summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorTimePath <andrew.hardaker1995@gmail.com>2016-04-10 18:30:56 +1000
committerTimePath <andrew.hardaker1995@gmail.com>2016-04-10 18:30:56 +1000
commit06602461e7b62f9166b1602d5bace89bcfaed455 (patch)
tree6defab676877e7eb2bc7df1ae0b2ea92a6c12154 /synapse/replication/resource.py
parentMerge branch 'release-v0.14.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-06602461e7b62f9166b1602d5bace89bcfaed455.tar.xz
Support PyPy
Diffstat (limited to 'synapse/replication/resource.py')
-rw-r--r--synapse/replication/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py
index 8c1ae0fbc7..9298bcb28e 100644
--- a/synapse/replication/resource.py
+++ b/synapse/replication/resource.py
@@ -20,7 +20,7 @@ from twisted.web.resource import Resource
 from twisted.web.server import NOT_DONE_YET
 from twisted.internet import defer
 
-import ujson as json
+import json
 
 import collections
 import logging