summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-15 14:09:30 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-15 14:09:30 +0100
commit1757e2d7c3a3d0b3646de08804579cf089b6390d (patch)
treef1e62938e5c5a31114e3e15fbb1db51de52f48ac /synapse
parentMerge pull request #5183 from matrix-org/erikj/async_serialize_event (diff)
parentfix some typos in the changelog (diff)
downloadsynapse-1757e2d7c3a3d0b3646de08804579cf089b6390d.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 cd9cfb2409..bf9e810da6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.4rc1"
+__version__ = "0.99.4"