diff options
author | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-01-09 13:25:48 +0000 |
commit | d773290cb1d015f0debe5f64f4e495612cf1da60 (patch) | |
tree | 33a7294ddad2c3fbbcbbd7b4831b6813176515dd /synapse/__init__.py | |
parent | Merge pull request #6664 from matrix-org/erikj/media_admin_apis (diff) | |
parent | Fixup changelog (diff) | |
download | synapse-d773290cb1d015f0debe5f64f4e495612cf1da60.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-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 a3bd855045..0dd538d804 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.8.0rc1" +__version__ = "1.8.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 |