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/storage/_base.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/storage/_base.py')
-rw-r--r-- | synapse/storage/_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 29fc334f45..be9934c66f 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -24,7 +24,7 @@ from synapse.util.lrucache import LruCache from twisted.internet import defer import collections -import json +import simplejson as json import sys import time |