summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:34:01 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:34:01 +0000
commit4a47ecf6ce946125e1b3d00adca079072c8f895f (patch)
tree979dc554f19af2ea7b2f5a2fa63fe1666d2b4925 /synapse
parentMerge pull request #6263 from matrix-org/erikj/caches_return_deferreds (diff)
parent1.5.0 (diff)
downloadsynapse-4a47ecf6ce946125e1b3d00adca079072c8f895f.tar.xz
1.5.0
* commit '9ffcf0f7b':
  1.5.0
  update ugrade notes
  Fix changelog name
  Update UPGRADE.rst
  Update UPGRADE.rst
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 d0f92ffbf3..8587ffa76f 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.5.0rc2"
+__version__ = "1.5.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