diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-07-08 11:25:34 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-07-08 11:25:34 +0100 |
| commit | 59ddcd790b76e0b86774c1c3b63ef1cd5d968ae1 (patch) | |
| tree | 047c6c84bc2b7aae934ce01be292d5e47e9266fe /synapse | |
| parent | Change Caddy links (old is deprecated) (#7789) (diff) | |
| parent | shuffle changelog slightly (diff) | |
| download | synapse-59ddcd790b76e0b86774c1c3b63ef1cd5d968ae1.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 0ffbcae502..de65ce6db8 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.16.0rc2" +__version__ = "1.16.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 |