summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-03-01 10:58:39 +0000
committerRichard van der Hoff <richard@matrix.org>2019-03-01 10:58:39 +0000
commit1beebe916f4446096930870716b2d3884478c4ef (patch)
tree1c7b80a71e582d4472ccc86494f2581765ce5de8 /synapse
parentMinor docstring fixes for MatrixFederationAgent (#4765) (diff)
parent0.99.2 (diff)
downloadsynapse-1beebe916f4446096930870716b2d3884478c4ef.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 29b1fe4c03..25c10244d3 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.2rc1"
+__version__ = "0.99.2"