summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-11-30 14:28:30 +0000
committerBrendan Abolivier <babolivier@matrix.org>2021-11-30 14:28:30 +0000
commitb14f8a1baf6f500997ae4c1d6a6d72094ce14270 (patch)
treea8fa755541f7e462247b1f72803dad7c8fe46028 /synapse/__init__.py
parentAdd missing copyright header. (#11460) (diff)
parentMerge trust_identity_server_for_password_resets PRs (diff)
downloadsynapse-b14f8a1baf6f500997ae4c1d6a6d72094ce14270.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 48ac38aec6..3cd1ce6070 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.47.1"
+__version__ = "1.48.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