diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-10-29 14:40:57 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-10-29 14:40:57 +0000 |
| commit | 65cb307e19d9307e79625a15a087acde265988a7 (patch) | |
| tree | 4a75598fa14548d3fbb8cca6e152ea4853af07b5 /synapse | |
| parent | Merge branch 'babolivier/changelog-name' into develop (diff) | |
| parent | 1.5.0 (diff) | |
| download | synapse-65cb307e19d9307e79625a15a087acde265988a7.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 d0f92ffbf3..8587ffa76f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.5.0rc2" +__version__ = "1.5.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 |