Eric Eastwood 72c718df54 Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry ... Conflicts: docs/usage/configuration/config_documentation.md synapse/logging/opentracing.py Got changes from: - https://github.com/matrix-org/synapse/pull/13362/files		2022-08-02 15:05:27 -05:00
..
administration	Merge branch 'master' into develop	2022-07-19 16:14:02 +02:00
configuration	Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry	2022-08-02 15:05:27 -05:00