summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-26 12:15:46 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-26 12:15:46 +0000
commit508e0f9310abedb4d10602e7bf7e57512900d80c (patch)
treeeb6dfd96d542cd61662260b5bc1a16be33b538b6
parent1.6.0rc2 (diff)
downloadsynapse-508e0f9310abedb4d10602e7bf7e57512900d80c.tar.xz
1.6.0
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md

index d26bc7a86f..f25627442e 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,9 @@ +Synapse 1.6.0 (2019-11-26) +========================== + +No significant changes. + + Synapse 1.6.0rc2 (2019-11-25) ============================= diff --git a/debian/changelog b/debian/changelog
index c4415f460a..82dae017f1 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.6.0) stable; urgency=medium + + * New synapse release 1.6.0. + + -- Synapse Packaging team <packages@matrix.org> Tue, 26 Nov 2019 12:15:40 +0000 + matrix-synapse-py3 (1.5.1) stable; urgency=medium * New synapse release 1.5.1. diff --git a/synapse/__init__.py b/synapse/__init__.py
index 051c83774e..53eedc0048 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.6.0rc2" +__version__ = "1.6.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