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

Conflicts:
	docs/usage/configuration/config_documentation.md
	poetry.lock
	synapse/handlers/message.py
	synapse/http/server.py
	synapse/logging/opentracing.py
	synapse/rest/client/keys.py
	synapse/rest/client/room.py

1 files changed, 1 insertions, 2 deletions

diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index 00704a6a7c..c35a5a12d5 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -957,8 +957,7 @@ class MatrixFederationHttpClient:
 
             args: query params
         Returns:
-            dict|list: Succeeds when we get a 2xx HTTP response. The
-            result will be the decoded JSON body.
+            Succeeds when we get a 2xx HTTP response. The result will be the decoded JSON body.
 
         Raises:
             HttpResponseException: If we get an HTTP response code >= 300