diff options
| author | Jason Robinson <jasonr@matrix.org> | 2021-01-25 15:55:54 +0200 |
|---|---|---|
| committer | Jason Robinson <jasonr@matrix.org> | 2021-01-25 15:55:54 +0200 |
| commit | fe18882bb5759133b8921b74d29d4a1906a69655 (patch) | |
| tree | bfb3ff30c09f50e0e8458eaff698d8509bf23496 /synapse/__init__.py | |
| parent | Merge branch 'develop' into jaywink/admin-forward-extremities (diff) | |
| parent | Merge tag 'v1.26.0rc2' into develop (diff) | |
| download | synapse-fe18882bb5759133b8921b74d29d4a1906a69655.tar.xz | |
Merge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extremities
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 |