diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-30 16:46:31 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-30 16:46:31 -0400 |
commit | 670972c0e1b98690480b7eac3a4b9b863e8d6761 (patch) | |
tree | e1c3fc0059a7df9da7a91385452eda28585dfc76 /synapse/__init__.py | |
parent | add changelog (diff) | |
parent | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_store (diff) | |
download | synapse-670972c0e1b98690480b7eac3a4b9b863e8d6761.tar.xz |
Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index bcc2f8c049..8587ffa76f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.5.0rc1" +__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 |