diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-25 11:32:24 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-25 11:32:24 +0100 |
commit | a71b8c87ec201fd25f06e37cac6ec828e37823a3 (patch) | |
tree | db9bb0d02438833a3ccad03aefcb900339e7b54d /sytest-blacklist | |
parent | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging (diff) | |
parent | Merge pull request #6256 from matrix-org/erikj/fix_e2e_workers (diff) | |
download | synapse-a71b8c87ec201fd25f06e37cac6ec828e37823a3.tar.xz |
Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'sytest-blacklist')
0 files changed, 0 insertions, 0 deletions