summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-01 14:18:07 +0000
committerErik Johnston <erik@matrix.org>2016-11-01 14:18:07 +0000
commit0aeb1324b7d1b690c24d11d4babb96bbc403ddb6 (patch)
treef5d146248431ce35f1ad810267024af4eb907bdf /synapse
parentMerge pull request #1184 from matrix-org/paul/metrics (diff)
parentBump version and changelog (diff)
downloadsynapse-0aeb1324b7d1b690c24d11d4babb96bbc403ddb6.tar.xz
Merge branch 'release-v0.18.2' 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 2c5dcf59f7..4e2a592d3d 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.18.2-rc3"
+__version__ = "0.18.2"