diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 15:57:40 +0100 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 15:57:40 +0100 |
| commit | 0a9d22808ceedaf9b96f417b777f7233a4dd8104 (patch) | |
| tree | d33926271277fecbd788a58d55f3ffd57c199fee /changelog.d | |
| parent | Merge pull request #6214 from matrix-org/rav/event_auth/1 (diff) | |
| parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
| download | synapse-0a9d22808ceedaf9b96f417b777f7233a4dd8104.tar.xz | |
Merge branch 'uhoreg/e2e_cross-signing_merged' into develop
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/5759.misc | 4 | ||||
| -rw-r--r-- | changelog.d/5769.feature | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changelog.d/5759.misc b/changelog.d/5759.misc new file mode 100644 index 0000000000..dc7e2c01bf --- /dev/null +++ b/changelog.d/5759.misc @@ -0,0 +1,4 @@ +Allow devices to be marked as hidden, for use by features such as cross-signing. +This adds a new field with a default value to the devices field in the database, +and so the database upgrade may take a long time depending on how many devices +are in the database. diff --git a/changelog.d/5769.feature b/changelog.d/5769.feature new file mode 100644 index 0000000000..bf994ca327 --- /dev/null +++ b/changelog.d/5769.feature @@ -0,0 +1 @@ +Allow uploading of cross-signing keys. \ No newline at end of file |