diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-05-19 09:56:15 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-05-19 09:56:15 -0400 |
commit | 02919bf4d80a283af94f576c1c7fe76869e3965a (patch) | |
tree | 9dabb44fc3c91b522ee92102346d7bef2ccde151 /synapse | |
parent | synctl warns when no process is stopped and avoids start (#6598) (diff) | |
parent | Merge tag 'v1.13.0' (diff) | |
download | synapse-02919bf4d80a283af94f576c1c7fe76869e3965a.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 6b26c5e87e..0abf491172 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.13.0rc3" +__version__ = "1.13.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 |