summary refs log tree commit diff
path: root/changelog.d/13966.misc
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-09-30 20:24:39 -0500
committerEric Eastwood <erice@element.io>2022-09-30 20:24:39 -0500
commit4a495ac43b093eb5e223b64ab5bc033233ab83b9 (patch)
treea656afce9494d347c1cf960fe941e2d842ea2422 /changelog.d/13966.misc
parentMerge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff)
parentClarifications in user directory for users who share rooms tracking (#13966) (diff)
downloadsynapse-4a495ac43b093eb5e223b64ab5bc033233ab83b9.tar.xz
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	synapse/handlers/message.py
	synapse/logging/opentracing.py
Diffstat (limited to 'changelog.d/13966.misc')
-rw-r--r--changelog.d/13966.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/13966.misc b/changelog.d/13966.misc
new file mode 100644
index 0000000000..b54ad5c776
--- /dev/null
+++ b/changelog.d/13966.misc
@@ -0,0 +1 @@
+Refactor language in user directory `_track_user_joined_room` code to make it more clear that we use both local and remote users.