diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-28 12:08:02 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-28 12:08:02 +0000 |
| commit | 96562131a49d5a0b0e7e68f94f0884d23daaf8f3 (patch) | |
| tree | 60704e66b8496e537ff833cd30002178673e4b00 /synapse | |
| parent | Remove local threepids on account deactivation (#6426) (diff) | |
| parent | 1.6.1 (diff) | |
| download | synapse-96562131a49d5a0b0e7e68f94f0884d23daaf8f3.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 53eedc0048..f99de2f3f3 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.6.0" +__version__ = "1.6.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 |