diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-13 10:33:58 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-13 10:33:58 +0100 |
commit | a9a8f29729201ccb6a501cb1a31552ee4a1dd692 (patch) | |
tree | dbfd0346f429237bf10969b00b2363c78e55f05e /synapse | |
parent | Multi arch docker support: add arm/v7 and arm64 to our docker images (#7921) (diff) | |
parent | 1.21.1 (diff) | |
download | synapse-a9a8f29729201ccb6a501cb1a31552ee4a1dd692.tar.xz |
Merge branch 'master' into develop
* master: 1.21.1 Explicitly install test dependencies when building deb packages (#8523)
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 57f818125a..722b53a67d 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.21.0" +__version__ = "1.21.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 |