summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-24 14:50:42 +0100
committerErik Johnston <erik@matrix.org>2016-08-24 14:50:42 +0100
commiteb6a7cf3f40e96a6c7eb79ab8f0e02ee58bcf38b (patch)
tree1c843a49d3d5168ff998a54f50d30cdc3814f104 /synapse
parentMerge pull request #1042 from matrix-org/erikj/preserve_log_contexts (diff)
parentBump changelog and version (diff)
downloadsynapse-eb6a7cf3f40e96a6c7eb79ab8f0e02ee58bcf38b.tar.xz
Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse 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 a63ee565cf..43bf78f885 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.17.0" +__version__ = "0.17.1"