diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-09 14:51:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-09 14:51:17 +0000 |
| commit | 9898bbd9dc60653cd0186460c0014505195ed874 (patch) | |
| tree | af4ffd4da02bc3c917537b4882010d776f9c6b5d | |
| parent | gah, fix mangled merge of 0.18.7 into develop (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-9898bbd9dc60653cd0186460c0014505195ed874.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 11 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 3fb3197ace..68e9d8c671 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +Changes in synapse v0.18.7 (2017-01-09) +======================================= + +No changes from v0.18.7-rc2 + + Changes in synapse v0.18.7-rc2 (2017-01-07) =========================================== @@ -6,6 +12,7 @@ Bug fixes: * Fix error in rc1's discarding invalid inbound traffic logic that was incorrectly discarding missing events + Changes in synapse v0.18.7-rc1 (2017-01-06) =========================================== @@ -16,6 +23,7 @@ Bug fixes: * Discard inbound federation traffic from invalid domains, to immunise against #1753 + Changes in synapse v0.18.6 (2017-01-06) ======================================= @@ -23,6 +31,7 @@ Bug fixes: * Fix bug when checking if a guest user is allowed to join a room (PR #1772) + Changes in synapse v0.18.6-rc3 (2017-01-05) =========================================== @@ -38,6 +47,7 @@ Changes: * Improve logging for debugging deadlocks (PR #1766, PR #1767) + Changes in synapse v0.18.6-rc2 (2016-12-30) =========================================== @@ -55,6 +65,7 @@ Bug fixes: * Make sure that outbound connections are closed (PR #1725) + Changes in synapse v0.18.5 (2016-12-16) ======================================= diff --git a/synapse/__init__.py b/synapse/__init__.py index cb332279df..498ded38c0 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.18.7-rc2" +__version__ = "0.18.7" |