summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-04-02 11:30:49 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-04-02 11:32:16 +0100
commit529462b5c044f7f7491fd41ab7d0682d01a6236b (patch)
treed087df47cc11fdecc7704929ae1b804a96654611
parentNote where bugs were introduced (diff)
downloadsynapse-529462b5c044f7f7491fd41ab7d0682d01a6236b.tar.xz
-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 a77768de58..e5608baa11 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,9 @@ +Synapse 1.12.1 (2020-04-02) +=========================== + +No significant changes since 1.12.1rc1. + + Synapse 1.12.1rc1 (2020-03-31) ============================== diff --git a/debian/changelog b/debian/changelog
index 39ec9da7ab..8e14e59c0d 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.12.1) stable; urgency=medium + + * New synapse release 1.12.1. + + -- Synapse Packaging team <packages@matrix.org> Mon, 02 Apr 2020 11:30:47 +0000 + matrix-synapse-py3 (1.12.0) stable; urgency=medium * New synapse release 1.12.0. diff --git a/synapse/__init__.py b/synapse/__init__.py
index c3c5b20f11..5df7d51ab1 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.12.1rc1" +__version__ = "1.12.1" 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