summary refs log tree commit diff
path: root/synapse/rest/media
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
committerErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
commitf609acc109af5b981c5662932392b60fa44ec5f0 (patch)
tree12041428a201b66a7c71569b8a8f1a855b9db032 /synapse/rest/media
parentMerge pull request #2798 from jeremycline/fedora-repo (diff)
parentNewline (diff)
downloadsynapse-f609acc109af5b981c5662932392b60fa44ec5f0.tar.xz
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1
Diffstat (limited to 'synapse/rest/media')
-rw-r--r--synapse/rest/media/v1/preview_url_resource.py2
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 40d2e664eb..a413cb6226 100644
--- a/synapse/rest/media/v1/preview_url_resource.py
+++ b/synapse/rest/media/v1/preview_url_resource.py
@@ -35,7 +35,7 @@ import os
 import re
 import fnmatch
 import cgi
-import ujson as json
+import simplejson as json
 import urlparse
 import itertools
 import datetime