summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-06-24 13:13:59 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-06-24 13:13:59 +0100
commitb21331359b37070c432db8242f5257a1055919fe (patch)
tree3994a75d145e0b6bb5e9439c53fa0884e2de3595
parentMerge branch 'release-v1.15.0' of github.com:matrix-org/synapse into dinsic-r... (diff)
downloadsynapse-b21331359b37070c432db8242f5257a1055919fe.tar.xz
Changelog
-rw-r--r--changelog.d/50.feature1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/50.feature b/changelog.d/50.feature
new file mode 100644

index 0000000000..0801622c8a --- /dev/null +++ b/changelog.d/50.feature
@@ -0,0 +1 @@ +Merge Synapse mainline v1.15.1 into the `dinsic` branch. \ No newline at end of file