diff options
| author | Eric Eastwood <erice@element.io> | 2022-11-18 17:05:41 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-11-18 17:05:41 -0600 |
| commit | 04de9ea73809670f4ce2cf0dc085065a324453e8 (patch) | |
| tree | 95cb00be91df21d3002651b0835eca8ea88645e5 /.git-blame-ignore-revs | |
| parent | Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemod... (diff) | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| download | synapse-04de9ea73809670f4ce2cf0dc085065a324453e8.tar.xz | |
Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemods/13356-messages-investigation-scratch-v1 github/madlittlemods/13356-messages-investigation-scratch-v1 madlittlemods/13356-messages-investigation-scratch-v1
Conflicts: synapse/handlers/federation.py synapse/handlers/relations.py
Diffstat (limited to '.git-blame-ignore-revs')
0 files changed, 0 insertions, 0 deletions