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

Conflicts:
	synapse/logging/opentracing.py
	tests/logging/test_opentracing.py

2022-08-09 14:46:03 -05:00

..

administration

Mark token-authenticaticated-registration API as not-experimental (#11897)

2022-08-05 11:15:35 +00:00

configuration

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

2022-08-09 14:46:03 -05:00