summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-13 12:16:27 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-13 12:16:27 +0100
commitd4b2e05852e25a941cf02f81314e220e943b85e0 (patch)
treec6416fa7fe93047c003eddb721da81071d363aaa
parentRevert "Use sortedcontainers instead of blist" (diff)
parentMerge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff)
downloadsynapse-d4b2e05852e25a941cf02f81314e220e943b85e0.tar.xz
Merge branch 'master' of https://github.com/matrix-org/synapse into develop
-rw-r--r--CHANGES.rst8
-rw-r--r--README.rst4
-rw-r--r--synapse/__init__.py2
3 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 684c5c7883..a838c092fe 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,13 @@
+Changes in synapse v0.27.3 (2018-04-11)
+======================================
+
+Bug fixes:
+
+* URL quote path segments over federation (#3082)
+
 Changes in synapse v0.27.3-rc2 (2018-04-09)
 ==========================================
+
 v0.27.3-rc1 used a stale version of the develop branch so the changelog overstates
 the functionality. v0.27.3-rc2 is up to date, rc1 should be ignored.
 
diff --git a/README.rst b/README.rst
index ef27b92ddd..8812cc1b4f 100644
--- a/README.rst
+++ b/README.rst
@@ -157,8 +157,8 @@ if you prefer.
 
 In case of problems, please see the _`Troubleshooting` section below.
 
-Alternatively, Silvio Fricke has contributed a Dockerfile to automate the
-above in Docker at https://registry.hub.docker.com/u/silviof/docker-matrix/.
+Alternatively, Andreas Peters (previously Silvio Fricke) has contributed a Dockerfile to automate the
+above in Docker at https://hub.docker.com/r/avhost/docker-matrix/tags/
 
 Also, Martin Giess has created an auto-deployment process with vagrant/ansible,
 tested with VirtualBox/AWS/DigitalOcean - see https://github.com/EMnify/matrix-synapse-auto-deploy
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7f6090baf8..1fa2de5268 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.27.3-rc2"
+__version__ = "0.27.3"