summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-21 15:46:43 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-21 15:46:43 +0100
commit4288fe6618cb0b36c7d81a54b4db19cce23eab9c (patch)
treeb3457beef004549eb8d986dc8c84914ab025c258
parentFix type error (diff)
downloadsynapse-4288fe6618cb0b36c7d81a54b4db19cce23eab9c.tar.xz
Changelog
-rw-r--r--changelog.d/67.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/67.misc b/changelog.d/67.misc
new file mode 100644

index 0000000000..0a2095e4d4 --- /dev/null +++ b/changelog.d/67.misc
@@ -0,0 +1 @@ +Merge mainline Synapse v1.21.2 into 'dinsic'. \ No newline at end of file