diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-11 13:31:22 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-11 13:31:22 +0100 |
| commit | 1ad06ee6ebc00d2d5120e54b0c6be1d46bf688bc (patch) | |
| tree | b575778cef7734c76920b811a9160f46134259b5 /synapse | |
| parent | Increase the default SAML session expirary time to 15 minutes. (#7664) (diff) | |
| parent | 1.15.0 (diff) | |
| download | synapse-1ad06ee6ebc00d2d5120e54b0c6be1d46bf688bc.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 39c3a3ba4d..1d9d85a727 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.15.0rc1" +__version__ = "1.15.0" 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 |