summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-17 14:38:36 +0000
committerErik Johnston <erik@matrix.org>2015-11-17 14:38:36 +0000
commit9eff52d1a64bc08880cfd3e6eaf7a042cf0eba52 (patch)
tree2a81df303b56a616c62d2cba7589be3903fab821
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 (diff)
downloadsynapse-9eff52d1a64bc08880cfd3e6eaf7a042cf0eba52.tar.xz
Bump changelog and version
-rw-r--r--CHANGES.rst5
-rw-r--r--synapse/__init__.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index f06fefa80e..068ed9f2ff 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse v0.11.0 (2015-11-17)
+=======================================
+
+* Change CAS login API (PR #349)
+
 Changes in synapse v0.11.0-rc2 (2015-11-13)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index df4c36c02e..f0eac97bab 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.11.0-rc2"
+__version__ = "0.11.0"