diff options
author | Mathieu Velten <mathieuv@matrix.org> | 2023-05-09 19:42:57 +0200 |
---|---|---|
committer | Mathieu Velten <mathieuv@matrix.org> | 2023-05-09 19:42:57 +0200 |
commit | 266d287165c9b7799c7cedc75606739b713cd9d6 (patch) | |
tree | 6a379292942a8c5af5668beed76b4b058481159f | |
parent | Error if attempting to set m.push_rules account data, per MSC4010. (#15555) (diff) | |
parent | 1.83.0 (diff) | |
download | synapse-266d287165c9b7799c7cedc75606739b713cd9d6.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 6 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | pyproject.toml | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md |