summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-05-22 15:56:55 +0100
committerNeil Johnson <neil@matrix.org>2019-05-22 15:56:55 +0100
commitae5521be9cb9305501dde4670adc8afac67fa83c (patch)
tree6ee2474cfee583140c9d242916d0ddf11ab3f107
parentNeilj/ensure get profileinfo available in client reader slaved store (#5213) (diff)
parent0.99.5 (diff)
downloadsynapse-ae5521be9cb9305501dde4670adc8afac67fa83c.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog4
-rw-r--r--synapse/__init__.py2
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"