Eric Eastwood 8def7e4b4b Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry ... Conflicts: poetry.lock synapse/federation/federation_client.py synapse/federation/federation_server.py synapse/handlers/federation.py synapse/handlers/federation_event.py synapse/logging/opentracing.py synapse/rest/client/room.py synapse/storage/controllers/persist_events.py synapse/storage/controllers/state.py		2022-08-18 16:33:22 -05:00
..
administration	A first pass at pruning the Synapse README (#13491)	2022-08-17 16:46:09 +01:00
configuration	Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry	2022-08-18 16:33:22 -05:00