Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2017-05-18 13:56:37 +01:00
commit f33df30732
3 changed files with 8 additions and 1 deletions

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.21.0-rc3"
__version__ = "0.21.0"