summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-10 14:26:01 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-10 14:26:01 +0000
commitde80e979c904985a15003eadb728d292c2fc3c99 (patch)
tree82009d59d913693c4c44f8ca27e5d1fcfefb0c5b
parentMerge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 (diff)
downloadsynapse-de80e979c904985a15003eadb728d292c2fc3c99.tar.xz
changelog
-rw-r--r--changelog.d/4373.bugfix1
-rw-r--r--changelog.d/4374.bugfix1
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/4373.bugfix b/changelog.d/4373.bugfix
deleted file mode 100644
index e50697cc52..0000000000
--- a/changelog.d/4373.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix problem reading macaroon_secret_key from config
diff --git a/changelog.d/4374.bugfix b/changelog.d/4374.bugfix
new file mode 100644
index 0000000000..0c8b0da5e6
--- /dev/null
+++ b/changelog.d/4374.bugfix
@@ -0,0 +1 @@
+Fix spontaneous logout on upgrade