diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-02 11:09:05 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-02 11:09:05 +0100 |
commit | b464afe2838a4d7556047e10ff1616858326c0d5 (patch) | |
tree | 8f7b23a944ed02fb5e9a113d1b0e2c09a9319d88 /tests/test_preview.py | |
parent | Merge branch 'rav/federation_sender_hackery' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings (diff) | |
download | synapse-b464afe2838a4d7556047e10ff1616858326c0d5.tar.xz |
Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/test_preview.py')
0 files changed, 0 insertions, 0 deletions