diff options
author | Krombel <krombel@krombel.de> | 2018-03-28 14:45:28 +0200 |
---|---|---|
committer | Krombel <krombel@krombel.de> | 2018-03-28 14:45:28 +0200 |
commit | 6152e253d842eb4f72be975850450f00c0662e43 (patch) | |
tree | 5fa7c6cef720825e05076190c7d0e1f45565a4b5 /synapse/rest/media | |
parent | move handling of auto_join_rooms to RegisterHandler (diff) | |
parent | Merge pull request #3042 from matrix-org/fix_locally_failing_tests (diff) | |
download | synapse-6152e253d842eb4f72be975850450f00c0662e43.tar.xz |
Merge branch 'develop' of into allow_auto_join_rooms
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 |