summary refs log tree commit diff
path: root/changelog.d/9819.feature
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-11-18 16:37:36 -0600
committerEric Eastwood <erice@element.io>2022-11-18 16:37:36 -0600
commitd993cb0b1c9efeebe52f40b8bdb871d02718c6d0 (patch)
tree9d68187784d5db6bdc242387af5400b141ab995a /changelog.d/9819.feature
parentFix poetry.lock conflicts (diff)
parentFix /key/v2/server calls with URL-unsafe key IDs (#14490) (diff)
downloadsynapse-d993cb0b1c9efeebe52f40b8bdb871d02718c6d0.tar.xz
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
Diffstat (limited to 'changelog.d/9819.feature')
0 files changed, 0 insertions, 0 deletions