diff options
author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-10-26 13:05:09 +0100 |
---|---|---|
committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-10-26 13:05:09 +0100 |
commit | 86b7d9b8862775353951322d604624e37d428a55 (patch) | |
tree | 63cb0283c9df72f3b334d26712147033d39774fb | |
parent | Save login tokens in database (#13844) (diff) | |
parent | 1.70.0 (diff) | |
download | synapse-86b7d9b8862775353951322d604624e37d428a55.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 |