Eric Eastwood d993cb0b1c Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry ...

Conflicts:
	docs/usage/configuration/config_documentation.md
	poetry.lock
	synapse/handlers/message.py
	synapse/http/server.py
	synapse/logging/opentracing.py
	synapse/rest/client/keys.py
	synapse/rest/client/room.py

2022-11-18 16:37:36 -06:00

..

administration

Update legacy synapse_admin_mau: metric names in docs (#14358)

2022-11-03 20:47:20 +00:00

configuration

Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry

2022-11-18 16:37:36 -06:00