diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-02-12 13:24:09 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-02-12 13:24:09 +0000 |
| commit | 47acbc519f7961698d3228e3c7bb15c5275ec7e9 (patch) | |
| tree | 4aa3d9453918afdde72be64550e6ffe52b60a6ac /synapse | |
| parent | Use BSD-compatible in-place editing for sed. (#6887) (diff) | |
| parent | Merge tag 'v1.10.0' (diff) | |
| download | synapse-47acbc519f7961698d3228e3c7bb15c5275ec7e9.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 ba339004ba..9d285fca38 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.10.0rc5" +__version__ = "1.10.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 |