Merge branch 'master' into develop

ccfcef6b · Matthew Hodgson · e0004aa2 · 24df5767 · ccfcef6b · ccfcef6b
Commit ccfcef6b authored 7 years ago by Matthew Hodgson
--- a/CHANGES.rst
+++ b/CHANGES.rst
+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)
 =======================================


--- 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"