summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-10-29 14:05:49 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-10-29 14:05:49 +0000
commitcc80968f6290b707b4cf2f69b50b3b9f569718c4 (patch)
tree0b7dc93106f2c8d737caf64535281cdd7b639670 /changelog.d
parentMerge pull request #6263 from matrix-org/erikj/caches_return_deferreds (diff)
parentFix changelog name (diff)
downloadsynapse-cc80968f6290b707b4cf2f69b50b3b9f569718c4.tar.xz
Merge branch 'babolivier/changelog-name' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/6268.bugfix (renamed from changelog.d/6286.bugfix)0
1 files changed, 0 insertions, 0 deletions
diff --git a/changelog.d/6286.bugfix b/changelog.d/6268.bugfix
index a4bebec1c7..a4bebec1c7 100644
--- a/changelog.d/6286.bugfix
+++ b/changelog.d/6268.bugfix