summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-10-24 11:12:12 +0100
committerGitHub <noreply@github.com>2018-10-24 11:12:12 +0100
commit3904cbf30761e7cbeea633467262837c62ef5829 (patch)
treefbd67b9770bae377e2a6427d6023523595ede1f2 /changelog.d
parentMerge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts (diff)
parentisort (diff)
downloadsynapse-3904cbf30761e7cbeea633467262837c62ef5829.tar.xz
Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase
Add v2 state resolution algorithm
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/3786.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/3786.misc b/changelog.d/3786.misc
new file mode 100644
index 0000000000..a9f9a2bb27
--- /dev/null
+++ b/changelog.d/3786.misc
@@ -0,0 +1 @@
+Add initial implementation of new state resolution algorithm