diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-09-22 16:00:30 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-09-22 16:00:30 +0100 |
| commit | b29a9bdaa9954adb0ae6289fd278572100dabef1 (patch) | |
| tree | 00a3a6e8b2814dce44eb7181839df35176c23db2 /synapse | |
| parent | Create function to check for long names in devices (#8364) (diff) | |
| parent | Fix wording of deprecation notice in changelog (diff) | |
| download | synapse-b29a9bdaa9954adb0ae6289fd278572100dabef1.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 a95753dcc7..8242d05f60 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.20.0rc5" +__version__ = "1.20.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 |