diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-09-24 17:00:33 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-09-24 17:00:33 +0100 |
commit | c77c4a2fcdcbb6dd741325bb2e522bc93e4291e2 (patch) | |
tree | ab21a3d4e3d9156eb9d080707754de0ebd06fee1 /synapse/__init__.py | |
parent | Fix MultiWriteIdGenerator's handling of restarts. (#8374) (diff) | |
parent | s/URLs/variables in changelog (diff) | |
download | synapse-c77c4a2fcdcbb6dd741325bb2e522bc93e4291e2.tar.xz |
Merge branch 'master' into develop
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 8242d05f60..e40b582bd5 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.20.0" +__version__ = "1.20.1" 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 |