diff options
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/6837.misc | 1 | ||||
-rw-r--r-- | changelog.d/6846.doc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/6837.misc b/changelog.d/6837.misc new file mode 100644 index 0000000000..0496f12de8 --- /dev/null +++ b/changelog.d/6837.misc @@ -0,0 +1 @@ +Port much of `synapse.handlers.federation` to async/await. 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 |