summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-10-19 11:28:56 +0100
committerDavid Baker <dave@matrix.org>2016-10-19 11:28:56 +0100
commita7f48320b18ecfb7dce23a153fb2ade9de481aaa (patch)
treea1722ba6980bb8066e948013e2bfb2ec2a660f26 /synapse/__init__.py
parentConvert emails to lowercase when storing (diff)
parentMerge pull request #1174 from matrix-org/erikj/email_push_noop (diff)
downloadsynapse-a7f48320b18ecfb7dce23a153fb2ade9de481aaa.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive
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 6dbe8fc7e7..6333c1119e 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.1"
+__version__ = "0.18.2-rc1"