Eric Eastwood fc04be1bed Merge branch 'develop' into madlittlemods/hs-specific-metrics ...

Conflicts:
	synapse/app/generic_worker.py
	synapse/app/homeserver.py

2025-05-20 14:21:19 -05:00

..

administration

Add a unit test for the phone home stats (#18463)

2025-05-20 16:26:45 +01:00

configuration

Merge branch 'develop' into madlittlemods/hs-specific-metrics

2025-05-20 14:21:19 -05:00