diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-12 16:41:52 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-12 16:41:52 +0100 |
commit | bc203c962f4c18bb41b0abf3d3e59957137d6530 (patch) | |
tree | 238857725fe52b6922c490e618c4a2f4eab73b4d /synapse | |
parent | Make event persisters periodically announce position over replication. (#8499) (diff) | |
parent | Reverse proxies are not the only thing to change;be explicit w/ new endpoint (diff) | |
download | synapse-bc203c962f4c18bb41b0abf3d3e59957137d6530.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-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 a86dc07ddc..57f818125a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.21.0rc3" +__version__ = "1.21.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 |