summary refs log tree commit diff
diff options
context:
space:
mode:
authorKrombel <krombel@krombel.de>2018-08-29 16:49:26 +0200
committerKrombel <krombel@krombel.de>2018-08-29 16:49:26 +0200
commit8c0c51ecb337c4dbbec371375e9c376fb2f666f7 (patch)
tree26c61ccee857c692914bee8a9a666d7ae0fa7d73
parentfix #3445 (diff)
downloadsynapse-8c0c51ecb337c4dbbec371375e9c376fb2f666f7.tar.xz
changelog
-rw-r--r--changelog.d/3445.bugfix1
-rw-r--r--changelog.d/3768.bugfix1
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/3445.bugfix b/changelog.d/3445.bugfix
deleted file mode 100644
index f7f1c4778d..0000000000
--- a/changelog.d/3445.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-do not use six.itervalues() on SortedDict()
diff --git a/changelog.d/3768.bugfix b/changelog.d/3768.bugfix
new file mode 100644
index 0000000000..a039a7fa68
--- /dev/null
+++ b/changelog.d/3768.bugfix
@@ -0,0 +1 @@
+Fix bug in sending presence over federation