summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-03-23 12:13:09 +0000
committerRichard van der Hoff <richard@matrix.org>2020-03-23 12:13:09 +0000
commit2fa55c0cc6396cab4ed74b450eb1a73b0a595ec6 (patch)
treeffe80d3385049a7a4a0d8c9b757c1ad4d477e723
parentmore changelog (diff)
downloadsynapse-2fa55c0cc6396cab4ed74b450eb1a73b0a595ec6.tar.xz
1.12.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 e3550497a4..9ba930e729 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,9 @@ +Synapse 1.12.0 (2020-03-23) +=========================== + +No significant changes. + + Synapse 1.12.0rc1 (2020-03-19) ============================== diff --git a/debian/changelog b/debian/changelog
index c39ea8f47f..39ec9da7ab 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.12.0) stable; urgency=medium + + * New synapse release 1.12.0. + + -- Synapse Packaging team <packages@matrix.org> Mon, 23 Mar 2020 12:13:03 +0000 + matrix-synapse-py3 (1.11.1) stable; urgency=medium * New synapse release 1.11.1. diff --git a/synapse/__init__.py b/synapse/__init__.py
index 020e0536be..5b86008945 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.12.0rc1" +__version__ = "1.12.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