diff options
author | Richard van der Hoff <richard@matrix.org> | 2021-01-21 13:17:07 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2021-01-21 13:17:07 +0000 |
commit | b5120f09f14bd42a705b89ef793c427178decd85 (patch) | |
tree | 7a3e55fdc2fd8dd1328179ab554be8985680c96b /CHANGES.md | |
parent | Use execute_batch instead of executemany in places (#9181) (diff) | |
parent | Prefix idp_id with "oidc-" (#9189) (diff) | |
download | synapse-b5120f09f14bd42a705b89ef793c427178decd85.tar.xz |
Merge remote-tracking branch 'origin/release-v1.26.0' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r-- | CHANGES.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md index 608965040d..1c64007e54 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,7 @@ Synapse 1.26.0rc1 (2021-01-20) ============================== This release brings a new schema version for Synapse and rolling back to a previous -verious is not trivial. Please review [UPGRADE.rst](UPGRADE.rst) for more details +version is not trivial. Please review [UPGRADE.rst](UPGRADE.rst) for more details on these changes and for general upgrade guidance. Features |