diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-01-27 11:13:21 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-01-27 11:13:21 -0500 |
| commit | 17b713850f2de134512bd8fff87c74c07d88d719 (patch) | |
| tree | 67e0260892717005dd68a380407b1ffa2363bfc9 | |
| parent | Clean-up the template loading code. (#9200) (diff) | |
| parent | Move note above changes. (diff) | |
| download | synapse-17b713850f2de134512bd8fff87c74c07d88d719.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 14 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index c9b6a13d7f..fcd782fa94 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,16 @@ Unreleased Note that this release includes a change in Synapse to use Redis as a cache ─ as well as a pub/sub mechanism ─ if Redis support is enabled. No action is needed by server administrators, and we do not expect resource usage of the Redis instance to change dramatically. +Synapse 1.26.0 (2021-01-27) +=========================== + +This release brings a new schema version for Synapse and rolling back to a previous +version is not trivial. Please review [UPGRADE.rst](UPGRADE.rst) for more details +on these changes and for general upgrade guidance. + +No significant changes since 1.26.0rc2. + + Synapse 1.26.0rc2 (2021-01-25) ============================== @@ -25,8 +35,8 @@ Synapse 1.26.0rc1 (2021-01-20) ============================== This release brings a new schema version for Synapse and rolling back to a previous -version is not trivial. Please review [UPGRADE.rst](UPGRADE.rst) for more details -on these changes and for general upgrade guidance. +version is not trivial. Please review [UPGRADE.rst](UPGRADE.rst) for more details +on these changes and for general upgrade guidance. Features -------- diff --git a/synapse/__init__.py b/synapse/__init__.py index 3cd682f9e7..93601dbad0 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.26.0rc2" +__version__ = "1.26.0" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when |