diff options
author | kaiyou <pierre@jaury.eu> | 2018-03-17 16:02:08 +0100 |
---|---|---|
committer | kaiyou <pierre@jaury.eu> | 2018-03-17 16:02:08 +0100 |
commit | 757f1b58437f912e147f523ea55d45dfda8a8c1e (patch) | |
tree | 034e210d3df7ef63c43ba0d5a35231ba398fedca /synapse/rest/media | |
parent | Disable logging to file and rely on the console when using Docker (diff) | |
parent | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff) | |
download | synapse-757f1b58437f912e147f523ea55d45dfda8a8c1e.tar.xz |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
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 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 |