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

Conflicts:
	poetry.lock
	synapse/api/auth.py
	synapse/federation/federation_client.py
	synapse/logging/opentracing.py
	synapse/rest/client/keys.py
	synapse/rest/client/sendtodevice.py
	synapse/storage/schema/__init__.py

2022-09-09 16:28:05 -05:00

..

administration

Add monthly active users documentation (#13617)

2022-09-01 14:48:43 +00:00

configuration

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

2022-09-09 16:28:05 -05:00