diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 10:52:16 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 10:52:16 +0100 |
| commit | 1c847af28a745434f0707188bc364d90eca5db81 (patch) | |
| tree | 23b5b0a59283552b9f07e3b240d68fb221a2c965 /synapse/storage/pusher.py | |
| parent | Merge pull request #244 from matrix-org/markjh/refresh_tokens (diff) | |
| parent | Fix typo in module imports and package dependencies (diff) | |
| download | synapse-1c847af28a745434f0707188bc364d90eca5db81.tar.xz | |
Merge pull request #243 from matrix-org/markjh/remove_syutil
Replace syutil dependency with smaller, single-purpose libraries
Diffstat (limited to 'synapse/storage/pusher.py')
| -rw-r--r-- | synapse/storage/pusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py index 08ea62681b..00b748f131 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py @@ -18,7 +18,7 @@ from twisted.internet import defer from synapse.api.errors import StoreError -from syutil.jsonutil import encode_canonical_json +from canonicaljson import encode_canonical_json import logging import simplejson as json |