diff options
author | Erik Johnston <erik@matrix.org> | 2018-03-15 23:43:31 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-03-15 23:43:31 +0000 |
commit | 926ba76e23ea9d55638baff541cdfaeb9e01ac47 (patch) | |
tree | 0fb744087cf47900122e60d5fa4b17765588a6b7 /synapse/rest/media | |
parent | Merge pull request #2798 from jeremycline/fedora-repo (diff) | |
download | synapse-926ba76e23ea9d55638baff541cdfaeb9e01ac47.tar.xz |
Replace ujson with simplejson
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 |