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

matrix-org · Dec 2, 2014 · 3aa333e · 3aa333e
2 parents c9f5af1 + 23a2c42
commit 3aa333e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse 0.5.3c (2014-12-02)
+======================================
+
+ * Change the default value for the `content_addr` option to use the HTTP
+   listener, as by default the HTTPS listener will be using a self-signed
+   certificate.
+
 Changes in synapse 0.5.3 (2014-11-27)
 =====================================
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.3a
+0.5.3c
diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.5.3a"
+__version__ = "0.5.3c"