diff options
author | Matthew Hodgson <matthew@matrix.org> | 2017-06-22 13:03:44 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2017-06-22 13:03:44 +0100 |
commit | ccfcef6b59a9ae4737297662a1ecd4a3251e20d2 (patch) | |
tree | c7e30a35b0b569725349ce8eba4d132dbc670f9c | |
parent | Add desc (diff) | |
parent | Merge pull request #2282 from matrix-org/release-v0.21.1 (diff) | |
download | synapse-ccfcef6b59a9ae4737297662a1ecd4a3251e20d2.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.rst | 8 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 82247fa528..5ef7eec4c2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,11 @@ +Changes in synapse v0.21.1 (2017-06-15) +======================================= + +Bug fixes: + +* Fix bug in anonymous usage statistic reporting (PR #2281) + + Changes in synapse v0.21.0 (2017-05-18) ======================================= diff --git a/synapse/__init__.py b/synapse/__init__.py index 2a40bab3f0..9df7d18993 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.21.0" +__version__ = "0.21.1" |