summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-10-15 14:44:32 -0600
committerTravis Ralston <travpc@gmail.com>2018-10-15 14:44:32 -0600
commitf293d124b6494baba71c14591a265af551214d1c (patch)
treec2eabdc7431cd56f7a598e1915aa91da4f3f03b3 /changelog.d
parentUpdate login terms structure for the proposed language support (diff)
parentMerge pull request #4019 from matrix-org/dbkr/e2e_backups (diff)
downloadsynapse-f293d124b6494baba71c14591a265af551214d1c.tar.xz
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/4019.feature1
-rw-r--r--changelog.d/4033.bugfix2
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/4019.feature b/changelog.d/4019.feature
new file mode 100644
index 0000000000..49e066d269
--- /dev/null
+++ b/changelog.d/4019.feature
@@ -0,0 +1 @@
+Add support for end-to-end key backup (MSC1687)
diff --git a/changelog.d/4033.bugfix b/changelog.d/4033.bugfix
new file mode 100644
index 0000000000..4e9e38cdcf
--- /dev/null
+++ b/changelog.d/4033.bugfix
@@ -0,0 +1,2 @@
+Synapse now starts on Python 3.7.
+_All_ workers now start on Python 3.