diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-27 15:10:50 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-27 15:10:50 +0100 |
| commit | 977078f06d173771cae66836b23ee76ef1a58e26 (patch) | |
| tree | 69262df020bb9d79e75bb6e0d19f04714436e2e7 /contrib | |
| parent | Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse into... (diff) | |
| download | synapse-977078f06d173771cae66836b23ee76ef1a58e26.tar.xz | |
Fix bad merge
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions