diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-16 00:13:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-16 00:13:51 +0000 |
| commit | f609acc109af5b981c5662932392b60fa44ec5f0 (patch) | |
| tree | 12041428a201b66a7c71569b8a8f1a855b9db032 /synapse/storage/devices.py | |
| parent | Merge pull request #2798 from jeremycline/fedora-repo (diff) | |
| parent | Newline (diff) | |
| download | synapse-f609acc109af5b981c5662932392b60fa44ec5f0.tar.xz | |
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1
Diffstat (limited to 'synapse/storage/devices.py')
| -rw-r--r-- | synapse/storage/devices.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index bd2effdf34..712106b83a 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import logging -import ujson as json +import simplejson as json from twisted.internet import defer |