diff options
author | Erik Johnston <erik@matrix.org> | 2020-12-09 11:26:48 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-12-09 11:26:48 +0000 |
commit | adfc9cb53dc81a0eae06aea740a0ca4708cbdc0c (patch) | |
tree | 77a5a7117f7978aec7e47775688e89d90c74fbe8 /synapse/__init__.py | |
parent | Add X-Robots-Tag header to stop crawlers from indexing media (#8887) (diff) | |
parent | 1.24.0 (diff) | |
download | synapse-adfc9cb53dc81a0eae06aea740a0ca4708cbdc0c.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 2e354f2cc6..f2d3ac68eb 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.24.0rc2" +__version__ = "1.24.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 |