Merge branch 'master' of github.com:matrix-org/synapse into develop

3 files changed, 9 insertions, 2 deletions

diff --git a/CHANGES.rst b/CHANGES.rst

index f1c67b20e0..199fb1384c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse v0.13.1 (2016-02-10)
+=======================================
+
+* Bump matrix-angular-sdk (matrix web console) dependency to 0.6.8 to
+  pull in the fix for SYWEB-361 so that the default client can display
+  HTML messages again(!)
+
 Changes in synapse v0.13.0 (2016-02-10)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 426330cc21..8da62c7b07 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.13.0"
+__version__ = "0.13.1"
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index a87628ed85..75bf3d13aa 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -39,7 +39,7 @@ REQUIREMENTS = {
 }
 CONDITIONAL_REQUIREMENTS = {
     "web_client": {
-        "matrix_angular_sdk>=0.6.6": ["syweb>=0.6.6"],
+        "matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"],
     }
 }