summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2020-02-04 16:21:09 +0000
committerGitHub <noreply@github.com>2020-02-04 16:21:09 +0000
commitc87572d6e426099fa36e2cd8260319531ec0fbb8 (patch)
tree42ae8cf800edde5cf7da695bfa7ea8e9c89e08a3 /changelog.d
parentMerge pull request #6837 from matrix-org/rav/federation_async (diff)
downloadsynapse-c87572d6e426099fa36e2cd8260319531ec0fbb8.tar.xz
Update CONTRIBUTING.md about merging PRs. (#6846)
Diffstat (limited to '')
-rw-r--r--changelog.d/6846.doc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/6846.doc b/changelog.d/6846.doc
new file mode 100644
index 0000000000..ad69d608c0
--- /dev/null
+++ b/changelog.d/6846.doc
@@ -0,0 +1 @@
+Add details of PR merge strategy to contributing docs.
\ No newline at end of file