summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-03 18:56:24 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-03 18:56:24 +0100
commitfa21455e08d4115cd14f6c4ca34a1b432d924b4f (patch)
tree625e52e306ffb2c29699f463188a24764f68bcb7
parentinclude disco in deb build target list (diff)
downloadsynapse-fa21455e08d4115cd14f6c4ca34a1b432d924b4f.tar.xz
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/5135.misc1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 4b84e20823..d8cfbbebef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 0.99.3.2 (2019-05-03)
+=============================
+
+Internal Changes
+----------------
+
+- Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`. ([\#5135](https://github.com/matrix-org/synapse/issues/5135))
+
+
 Synapse 0.99.3.1 (2019-05-03)
 =============================
 
diff --git a/changelog.d/5135.misc b/changelog.d/5135.misc
deleted file mode 100644
index eab06dd91d..0000000000
--- a/changelog.d/5135.misc
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index ea712f0dab..c25425bf26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (0.99.3.2) stable; urgency=medium
+
+  * New synapse release 0.99.3.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 03 May 2019 18:56:20 +0100
+
 matrix-synapse-py3 (0.99.3.1) stable; urgency=medium
 
   * New synapse release 0.99.3.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 8959312cb0..315fa96551 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.3.1"
+__version__ = "0.99.3.2"