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

Conflicts:
	synapse/handlers/message.py
	synapse/logging/opentracing.py

2022-09-30 20:24:39 -05:00

..

administration

Update request log format documentation to mention the format used when the authenticated user is controlling another user. (#13794)

2022-09-16 11:48:41 +00:00

configuration

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

2022-09-30 20:24:39 -05:00