diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 14:23:10 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 14:23:10 +0000 |
| commit | 4ebbaf0d4382813ba896f3e8101de12e112cbed5 (patch) | |
| tree | 179bf2e1a0d0330437518eff45788604ab2f4ad7 /synapse/rest/media/v0 | |
| parent | Mention new libs in CHANGES (diff) | |
| download | synapse-4ebbaf0d4382813ba896f3e8101de12e112cbed5.tar.xz | |
Blunty replace json with simplejson
Diffstat (limited to 'synapse/rest/media/v0')
| -rw-r--r-- | synapse/rest/media/v0/content_repository.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v0/content_repository.py b/synapse/rest/media/v0/content_repository.py index 22e26e3cd5..e77a20fb2e 100644 --- a/synapse/rest/media/v0/content_repository.py +++ b/synapse/rest/media/v0/content_repository.py @@ -25,7 +25,7 @@ from twisted.web import server, resource from twisted.internet import defer import base64 -import json +import simplejson as json import logging import os import re |