diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-30 20:24:39 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-09-30 20:24:39 -0500 |
| commit | 4a495ac43b093eb5e223b64ab5bc033233ab83b9 (patch) | |
| tree | a656afce9494d347c1cf960fe941e2d842ea2422 /synapse/config/server.py | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| parent | Clarifications in user directory for users who share rooms tracking (#13966) (diff) | |
| download | synapse-4a495ac43b093eb5e223b64ab5bc033233ab83b9.tar.xz | |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: synapse/handlers/message.py synapse/logging/opentracing.py
Diffstat (limited to 'synapse/config/server.py')
0 files changed, 0 insertions, 0 deletions