diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-12-18 10:16:39 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-12-18 10:16:39 +0000 |
| commit | 91ccfe9f37ae0467a1b1b82640034d6b3e8174a2 (patch) | |
| tree | e9ba071fe33edeb018238e2bb7040804e70fda8e /synapse | |
| parent | Merge release-v1.7.1 into develop (diff) | |
| parent | Merge tag 'v1.7.1' (diff) | |
| download | synapse-91ccfe9f37ae0467a1b1b82640034d6b3e8174a2.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 d3cf7b3d7b..e951bab593 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.7.0" +__version__ = "1.7.1" 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 |