diff options
author | Erik Johnston <erik@matrix.org> | 2020-01-31 15:06:16 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-01-31 15:06:16 +0000 |
commit | c854d255e50a72f9518e7a844f01e8c9ec00d943 (patch) | |
tree | 5813368d63ce4342df006bf2ef659b4b7ee28138 /synapse/http/matrixfederationclient.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Fix deleting of stale marker for device lists (#6819) (diff) | |
download | synapse-c854d255e50a72f9518e7a844f01e8c9ec00d943.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r-- | synapse/http/matrixfederationclient.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py |