diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-08-28 18:17:26 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-08-28 18:17:26 +0100 |
| commit | e5df12ad1668ba1d75e3d5fdf5fe1cb7d0a43400 (patch) | |
| tree | 6434740f5f259c420f0863ad50d7a0ff3314d5a9 /changelog.d | |
| parent | Implement per-room message retention policies (diff) | |
| parent | Merge pull request #5812 from matrix-org/babolivier/account-validity-messages (diff) | |
| download | synapse-e5df12ad1668ba1d75e3d5fdf5fe1cb7d0a43400.tar.xz | |
Merge branch 'dinsic' into babolivier/dinsic-message-retention
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/5760.feature | 1 | ||||
| -rw-r--r-- | changelog.d/5780.misc | 1 | ||||
| -rw-r--r-- | changelog.d/5807.feature | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/5760.feature b/changelog.d/5760.feature new file mode 100644 index 0000000000..90302d793e --- /dev/null +++ b/changelog.d/5760.feature @@ -0,0 +1 @@ +Force the access rule to be "restricted" if the join rule is "public". diff --git a/changelog.d/5780.misc b/changelog.d/5780.misc new file mode 100644 index 0000000000..b7eb56e625 --- /dev/null +++ b/changelog.d/5780.misc @@ -0,0 +1 @@ +Allow looping calls to be given arguments. diff --git a/changelog.d/5807.feature b/changelog.d/5807.feature new file mode 100644 index 0000000000..8b7d29a23c --- /dev/null +++ b/changelog.d/5807.feature @@ -0,0 +1 @@ +Allow defining HTML templates to serve the user on account renewal attempt when using the account validity feature. |