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

8b5349c7 · Erik Johnston · 7a802ec0 · f9d9bd6a · 8b5349c7 · 8b5349c7
Commit 8b5349c7 authored 9 years ago by Erik Johnston
--- a/CHANGES.rst
+++ b/CHANGES.rst
+Changes in synapse v0.11.0-r2 (2015-11-19)
+==========================================
+
+* Fix bug in database port script (PR #387)
+
 Changes in synapse v0.11.0-r1 (2015-11-18)
 ==========================================


--- 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-r1"
+__version__ = "0.11.0-r2"