summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-03-08 14:06:35 +0000
committerErik Johnston <erik@matrix.org>2021-03-08 14:06:35 +0000
commitb988b07bb0d07d5d5f1323cc4d3282f5876b62f6 (patch)
treed0db1db9c73674283bbc329fc118655f7e9bca5e /synapse/__init__.py
parentCreate a SynapseReactor type which incorporates the necessary reactor interfa... (diff)
parentFixup changelog (diff)
downloadsynapse-b988b07bb0d07d5d5f1323cc4d3282f5876b62f6.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2c24d4ae03..56ca888862 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.29.0rc1"
+__version__ = "1.29.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