summary refs log tree commit diff
path: root/changelog.d/3612.misc
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-08-09 19:23:47 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-08-09 19:23:47 +1000
commit984376745b655d7b755e267a89a5b57ddfd3cf8b (patch)
treeea59b71d17d43f3ca7cac94c071cbd162c3550fe /changelog.d/3612.misc
parentMerge pull request #3632 from matrix-org/erikj/refactor_repl_servlet (diff)
parent0.33.2 changelog (diff)
downloadsynapse-984376745b655d7b755e267a89a5b57ddfd3cf8b.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/3612.misc')
-rw-r--r--changelog.d/3612.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/3612.misc b/changelog.d/3612.misc
deleted file mode 100644
index f90d2f2ff5..0000000000
--- a/changelog.d/3612.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make EventStore inherit from EventFederationStore