diff options
| author | David Baker <dave@matrix.org> | 2018-11-09 18:35:02 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-11-09 18:35:02 +0000 |
| commit | bca3b91c2dfeb63b43c3bfbb6700a38d4903f1eb (patch) | |
| tree | ec18566349f9e3cae83699cffd2a714ae9dce932 /changelog.d/3786.misc | |
| parent | pep8 (diff) | |
| parent | Merge pull request #4168 from matrix-org/babolivier/federation-client-content... (diff) | |
| download | synapse-bca3b91c2dfeb63b43c3bfbb6700a38d4903f1eb.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_are_numbers
Diffstat (limited to 'changelog.d/3786.misc')
| -rw-r--r-- | changelog.d/3786.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/3786.misc b/changelog.d/3786.misc deleted file mode 100644 index a9f9a2bb27..0000000000 --- a/changelog.d/3786.misc +++ /dev/null @@ -1 +0,0 @@ -Add initial implementation of new state resolution algorithm |