summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-11-17 12:13:14 +0000
committerRichard van der Hoff <richard@matrix.org>2017-11-17 12:13:14 +0000
commitd8a05418f97827fd768a1abc540b204f9120d50f (patch)
tree6827428a35bd8d65720b1cbd5bc2ba4f25d02eae /synapse/__init__.py
parentMerge pull request #2686 from matrix-org/luke/as-flair (diff)
parentMerge branch 'release-v0.25.1' (diff)
downloadsynapse-d8a05418f97827fd768a1abc540b204f9120d50f.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e04208961f..8c3d7a210a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.25.0"
+__version__ = "0.25.1"