diff options
| author | Eric Eastwood <erice@element.io> | 2022-08-18 16:33:22 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-08-18 16:33:22 -0500 |
| commit | 8def7e4b4b6d0ecfb7776bf987f621e38946b50c (patch) | |
| tree | 92fb7ce5f7008e7b053a36342409e1958fbdbb46 /.dockerignore | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| parent | Add metrics to track `/messages` response time by room size (#13545) (diff) | |
| download | synapse-8def7e4b4b6d0ecfb7776bf987f621e38946b50c.tar.xz | |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: poetry.lock synapse/federation/federation_client.py synapse/federation/federation_server.py synapse/handlers/federation.py synapse/handlers/federation_event.py synapse/logging/opentracing.py synapse/rest/client/room.py synapse/storage/controllers/persist_events.py synapse/storage/controllers/state.py
Diffstat (limited to '.dockerignore')
0 files changed, 0 insertions, 0 deletions