diff options
author | Erik Johnston <erik@matrix.org> | 2021-01-26 14:15:26 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-01-26 14:15:26 +0000 |
commit | 512e313f18308d1adcb967bf9f05f8eb1ce45753 (patch) | |
tree | c745520eaf73cd29144c1ba0efb3d83335897626 /synapse/__init__.py | |
parent | Merge remote-tracking branch 'origin/release-v1.26.0' into matrix-org-hotfixes (diff) | |
parent | Precompute joined hosts and store in Redis (#9198) (diff) | |
download | synapse-512e313f18308d1adcb967bf9f05f8eb1ce45753.tar.xz |
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
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 d423856d82..3cd682f9e7 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.26.0rc1" +__version__ = "1.26.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 |