summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/3612.misc1
-rw-r--r--changelog.d/3626.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3612.misc b/changelog.d/3612.misc
new file mode 100644
index 0000000000..f90d2f2ff5
--- /dev/null
+++ b/changelog.d/3612.misc
@@ -0,0 +1 @@
+Make EventStore inherit from EventFederationStore
diff --git a/changelog.d/3626.bugfix b/changelog.d/3626.bugfix
new file mode 100644
index 0000000000..9a4b878986
--- /dev/null
+++ b/changelog.d/3626.bugfix
@@ -0,0 +1 @@
+Only import secrets when available (fix for py < 3.6)