diff options
author | Erik Johnston <erik@matrix.org> | 2019-12-10 12:50:04 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-12-10 12:50:04 +0000 |
commit | aadc131dc1aa5f95f8f162c7330f19a3ba543443 (patch) | |
tree | c626c810424612e3f6a3a0cdba4ae1e878efd642 /synapse/app/pusher.py | |
parent | Merge branch 'release-v1.7.0' of github.com:matrix-org/synapse into matrix-or... (diff) | |
parent | Changelog (diff) | |
download | synapse-aadc131dc1aa5f95f8f162c7330f19a3ba543443.tar.xz |
Merge branch 'babolivier/pusher-room-store' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r-- | synapse/app/pusher.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py |