diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-09-10 10:15:02 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-09-10 10:15:02 +0100 |
| commit | e44e9ee5189bfa9de010276f603fb0bd9ba9bd3b (patch) | |
| tree | de105bae1bb7f590d91b6133bd845156718e67ef /synapse/__init__.py | |
| parent | Do not error when thumbnailing invalid files (#8236) (diff) | |
| parent | 1.20.0rc2 (diff) | |
| download | synapse-e44e9ee5189bfa9de010276f603fb0bd9ba9bd3b.tar.xz | |
Merge branch 'release-v1.20.0' 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 f4aca64be8..7e8731f86a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.20.0rc1" +__version__ = "1.20.0rc2" 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 |