summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:30:17 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:30:17 +0100
commit5b03150d67dca2618599a7079e928bbd4c8adf28 (patch)
tree26cdf9b5fe7062f1fb94e867ed1d589bdfbfe91c /synapse
parentMerge commit '1baab2035' into anoa/dinsic_release_1_31_0 (diff)
parent1.26.0 (diff)
downloadsynapse-5b03150d67dca2618599a7079e928bbd4c8adf28.tar.xz
Merge commit '73ed289bd' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
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