diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-13 10:55:47 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-13 10:55:47 +0000 |
| commit | f46e05d0537e79e2811522fad5021a20f41fd733 (patch) | |
| tree | 8e64bd77b9771d32c594470cbab9225b74701f09 /synapse | |
| parent | Adjust the sytest blacklist for worker mode (#6538) (diff) | |
| parent | Merge tag 'v1.7.0' (diff) | |
| download | synapse-f46e05d0537e79e2811522fad5021a20f41fd733.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 fc2a6e4ee6..d3cf7b3d7b 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.7.0rc2" +__version__ = "1.7.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 |