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

Conflicts:
	docs/usage/configuration/config_documentation.md
	synapse/api/auth.py

2022-08-03 15:15:34 -05:00

..

administration

Improve documentation on becoming server admin (#13230)

2022-08-03 11:15:23 +01:00

configuration

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

2022-08-03 15:15:34 -05:00