diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-24 11:23:49 +0100 |
| commit | 3ad359e5becf7834fad3034a8d18f61206ede8f1 (patch) | |
| tree | 741c28822a3b5e26d229be68bc06c95a25218748 /changelog.d | |
| parent | Allow backslashes in event field filters (diff) | |
| parent | Merge pull request #4082 from matrix-org/rav/fix_pep8 (diff) | |
| download | synapse-3ad359e5becf7834fad3034a8d18f61206ede8f1.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_validation
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/3786.misc | 1 | ||||
| -rw-r--r-- | changelog.d/4082.misc | 1 |
2 files changed, 2 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 diff --git a/changelog.d/4082.misc b/changelog.d/4082.misc new file mode 100644 index 0000000000..a81faf5e9b --- /dev/null +++ b/changelog.d/4082.misc @@ -0,0 +1 @@ +Clean up some bits of code which were flagged by the linter |