diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-19 11:40:32 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-19 11:41:01 +0000 |
| commit | fa728034900ae63d8132962008319d37df3993db (patch) | |
| tree | 9ed8d7230c116bc28057f11395a795d3f993880c /synapse/rest/media | |
| parent | spell out not to massively increase bcrypt rounds (diff) | |
| parent | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff) | |
| download | synapse-fa728034900ae63d8132962008319d37df3993db.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest/media')
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index 31fe7aa75c..0fc21540c6 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -23,7 +23,7 @@ import re import shutil import sys import traceback -import ujson as json +import simplejson as json import urlparse from twisted.web.server import NOT_DONE_YET |