diff options
author | Erik Johnston <erik@matrix.org> | 2017-07-07 18:26:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-07-07 18:26:28 +0100 |
commit | f467a8f66dac153428efa8c2b6296b84674a91ea (patch) | |
tree | 100f3072b9a29af48f7ff55bea04f548702e1c9a | |
parent | Merge pull request #2344 from matrix-org/erikj/frontend_proxy (diff) | |
parent | Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse (diff) | |
download | synapse-f467a8f66dac153428efa8c2b6296b84674a91ea.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r-- | CHANGES.rst | 9 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index e7c12dd919..a415944756 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,12 @@ +Changes in synapse v0.22.1 (2017-07-06) +======================================= + +Bug fixes: + +* Fix bug where pusher pool didn't start and caused issues when + interacting with some rooms (PR #2342) + + Changes in synapse v0.22.0 (2017-07-06) ======================================= diff --git a/synapse/__init__.py b/synapse/__init__.py index 60af1cbecd..dbf22eca00 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.22.0" +__version__ = "0.22.1" |