summary refs log tree commit diff
path: root/synapse/storage/event_push_actions.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
committerErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
commitf609acc109af5b981c5662932392b60fa44ec5f0 (patch)
tree12041428a201b66a7c71569b8a8f1a855b9db032 /synapse/storage/event_push_actions.py
parentMerge pull request #2798 from jeremycline/fedora-repo (diff)
parentNewline (diff)
downloadsynapse-0.26.1.tar.xz
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1
Diffstat (limited to 'synapse/storage/event_push_actions.py')
-rw-r--r--synapse/storage/event_push_actions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py

index 8efe2fd4bb..575d710d5d 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py
@@ -21,7 +21,7 @@ from synapse.types import RoomStreamToken from .stream import lower_bound import logging -import ujson as json +import simplejson as json logger = logging.getLogger(__name__)