diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-22 18:30:17 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-22 18:30:17 +0100 |
| commit | 5b03150d67dca2618599a7079e928bbd4c8adf28 (patch) | |
| tree | 26cdf9b5fe7062f1fb94e867ed1d589bdfbfe91c | |
| parent | Merge commit '1baab2035' into anoa/dinsic_release_1_31_0 (diff) | |
| parent | 1.26.0 (diff) | |
| download | synapse-5b03150d67dca2618599a7079e928bbd4c8adf28.tar.xz | |
Merge commit '73ed289bd' into anoa/dinsic_release_1_31_0
| -rw-r--r-- | CHANGES.md | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md index fb07650c2c..14b19bb4b0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +Synapse 1.26.0 (2021-01-27) +=========================== + +No significant changes. + + Synapse 1.26.0rc2 (2021-01-25) ============================== 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 |