Merge branch 'master' into develop

3 files changed, 11 insertions, 1 deletions

diff --git a/CHANGES.md b/CHANGES.md

index 25ceec8b48..d1c9ea0e1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 0.99.5 (2019-05-22)
+===========================
+
+No significant changes.
+
+
 Synapse 0.99.5rc1 (2019-05-21)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog

index 35cf8ffb20..e148c32728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+matrix-synapse-py3 (0.99.5) stable; urgency=medium
+
+  * New synapse release 0.99.5.
+
 matrix-synapse-py3 (0.99.4) stable; urgency=medium
 
   [ Christoph Müller ]
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 42af03b53d..d66d2411a1 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.5rc1"
+__version__ = "0.99.5"