diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-22 18:44:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-22 18:44:29 +0100 |
| commit | c17efdc01c36b5078a7306843c560abd2b3238f9 (patch) | |
| tree | c96bca83c8dba442c63c52e8e18bae29a1eb8ce8 /changelog.d | |
| parent | Clean up prepare_database.py a bit and add comments (diff) | |
| parent | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 (diff) | |
| download | synapse-c17efdc01c36b5078a7306843c560abd2b3238f9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/5726.feature | 1 | ||||
| -rw-r--r-- | changelog.d/6229.bugfix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/5726.feature b/changelog.d/5726.feature new file mode 100644 index 0000000000..d3c669aec0 --- /dev/null +++ b/changelog.d/5726.feature @@ -0,0 +1 @@ +Add ability to upload cross-signing signatures. diff --git a/changelog.d/6229.bugfix b/changelog.d/6229.bugfix new file mode 100644 index 0000000000..bced3304d0 --- /dev/null +++ b/changelog.d/6229.bugfix @@ -0,0 +1 @@ +Prevent the demo Synapse's from blacklisting `::1`. \ No newline at end of file |