diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-09-07 13:44:54 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-09-07 13:44:54 +0100 |
commit | d74e8f28753e0fca8ae6c9f47f248a2abf9d998a (patch) | |
tree | e3df12529ee5480daed23131d58fa8cbe77b70c9 /synapse/push/httppusher.py | |
parent | Merge branch 'develop' into matrix-org-hotfixes (diff) | |
parent | Add cross-signing sigs to the `keys` object (#8234) (diff) | |
download | synapse-d74e8f28753e0fca8ae6c9f47f248a2abf9d998a.tar.xz |
Merge branch 'release-v1.20.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/push/httppusher.py')
-rw-r--r-- | synapse/push/httppusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py |