diff options
| author | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
|---|---|---|
| committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-09 08:51:11 +0200 |
| commit | b5e157d895dcf182d7ffc58edf6442deeaebc3f0 (patch) | |
| tree | a3f8a4549d0fe4947bef34632218b41c94202b19 /synapse/util/frozenutils.py | |
| parent | take idna implementation from twisted (diff) | |
| parent | Add an isort configuration (#3463) (diff) | |
| download | synapse-b5e157d895dcf182d7ffc58edf6442deeaebc3f0.tar.xz | |
Merge branch 'develop' into send_sni_for_federation_requests
# Conflicts: # synapse/http/endpoint.py
Diffstat (limited to 'synapse/util/frozenutils.py')
| -rw-r--r-- | synapse/util/frozenutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py index 15f0a7ba9e..535e7d0e7a 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py @@ -14,7 +14,7 @@ # limitations under the License. from frozendict import frozendict -import simplejson as json +from canonicaljson import json from six import string_types |