diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-19 16:17:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-19 16:17:54 +0000 |
| commit | 8b5349c7bc28db2e47c80936233fd1e1ef757623 (patch) | |
| tree | 79f164a2cde34f67bb43bf40ad5ea3489d849410 | |
| parent | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data (diff) | |
| parent | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse (diff) | |
| download | synapse-8b5349c7bc28db2e47c80936233fd1e1ef757623.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 5 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 5bea8e82d5..d01eca4004 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +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) ========================================== diff --git a/synapse/__init__.py b/synapse/__init__.py index 5a83f5f3ec..7ff37edf2c 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-r1" +__version__ = "0.11.0-r2" |