summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-05-22 17:59:43 +0100
committerNeil Johnson <neil@matrix.org>2019-05-22 17:59:43 +0100
commit73f1de31d107187949203ec8e3b3f248170b6316 (patch)
tree4d776766aa7e8122610725a20c1844df2860fd55
parentremove urllib3 pin (#5230) (diff)
parent0.99.5.1 (diff)
downloadsynapse-73f1de31d107187949203ec8e3b3f248170b6316.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
3 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index d1c9ea0e1a..6bdfdd6d70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 0.99.5.1 (2019-05-22)
+=============================
+
+No significant changes.
+
+
 Synapse 0.99.5 (2019-05-22)
 ===========================
 
diff --git a/debian/changelog b/debian/changelog
index e148c32728..90c6b86c5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-matrix-synapse-py3 (0.99.5) stable; urgency=medium
+matrix-synapse-py3 (0.99.5.1) stable; urgency=medium
 
-  * New synapse release 0.99.5.
+  * New synapse release 0.99.5.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 22 May 2019 16:22:24 +0000
 
 matrix-synapse-py3 (0.99.4) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d66d2411a1..4f95778eea 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.5"
+__version__ = "0.99.5.1"