1.12.3
4 files changed, 16 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 5cec3d817d..e9ca767644 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.12.3 (2020-04-03)
+===========================
+
+Internal Changes
+----------------
+
+- Roll back the pin to Pillow 7.0 which was introduced in Synapse 1.12.2. ([\#7212](https://github.com/matrix-org/synapse/issues/7212))
+
+
Synapse 1.12.2 (2020-04-02)
===========================
diff --git a/changelog.d/7212.misc b/changelog.d/7212.misc
deleted file mode 100644
index b57fc5f288..0000000000
--- a/changelog.d/7212.misc
+++ /dev/null
@@ -1 +0,0 @@
-Roll back the pin to Pillow 7.0 which was introduced in Synapse 1.12.2.
diff --git a/debian/changelog b/debian/changelog
index 6bafe468d9..642115fc5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-matrix-synapse-py3 (1.12.2ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.12.3) stable; urgency=medium
+ [ Richard van der Hoff ]
* Update the Debian build scripts to handle the new installation paths
for the support libraries introduced by Pillow 7.1.1.
- -- Richard van der Hoff <richard@matrix.org> Thu, 02 Apr 2020 23:18:52 +0100
+ [ Synapse Packaging team ]
+ * New synapse release 1.12.3.
+
+ -- Synapse Packaging team <packages@matrix.org> Fri, 03 Apr 2020 10:55:03 +0100
matrix-synapse-py3 (1.12.2) stable; urgency=medium
diff --git a/synapse/__init__.py b/synapse/__init__.py
index bdad75113d..3bf2d02450 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.12.2"
+__version__ = "1.12.3"
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
|
